Added get/set methods to data schema