CRUD actions refactor (Phase 2)