CRUD Refactored