Added the new commit of refactored __get and __set