Changed the way the class methods are called