Improve the CRUD APIs