added some needed classes