Removed hard-coded proprety