Changes to the constructor and the respective changes