updated common classes