more changes for property entity