Updated more propery definitions