Added some helper base classes