Added in class name checking