Added some bolilerplate classes