Added common classes