20141202 - Corrections to class list