Merge with head:
Support all classes now
merge with head