creatorRegistry refactoring