20141109 - Corrections to class list