Added some common classes