Added some more missing classes