CRUD actions refactor (Phase 3)