Fixed up getter/setter managing