Continuation of refactoring catalog