Added some helper classes