Updated the class constructor a bit more.