Refactor current selection management within new entity creation process