Added asserting of class names