20140930 - Corrections to class list