Added Custom entity properties
Minor changes