more updates for new CRUD api