Whoops - added some of the missing classes