Converted Entity to use namespaces