Property functionality cleanup
Reorgagnize code for EntityClass and Property functionalities