Updated the class