Add back get and set methods