Changed getter and setter