Added checks for all classes