20140922 - Corrections to class list