Changes to the constructor function