20141126 - Corrections to class list