Added more functions to the class