CRUD action refactor (Phase 6)