Common classes revision