- Added more functions to classes