added properties and get/set