Changes to constructor and get methods