Updated get and set methods