CRUD action refactor (Phase 5)