Changed main classes