Updated the constructor and other files.