Updated application to fix issues with entity creation