Added some classes and expanded some old ones