Added some classes to work with