Changes on get and set functions