Added getter and setter