Added some classes for SPRAT