CRUD action refactor (Phase 4)