Modified singleClasses