Added get/set Property functions