Added get and set function