A bunch of API updates