20141003 - Corrections to class list