Improve the CRUD example