Adapt to refactored CRUD lists