CRUD action refactor (Phase 7)