Updated more property definitions