CRUD action refactor (Phase 8)