Some API updates