20141207 - Corrections to class list