Refactored creation of policies and enrichers to occur after entity creation