added back classes that were missing