Added all classes so far