Changed get_ and set_ methods