Updated entity to resolve namespace issues