API updates; see godoc for more info