A few API updates