Pushed an optimzed update scheme for api, ready for booklist