Improved CRUD example yet again