Updated get and set value methods