Refactoring to take advantage of up front entity creation