Updated with all classes