Updating main classes