Began restructuring entity to support property entity api integration.