some updates for new CRUD API