CRUD actions refactor (Phase 1)