Switched to better way to do sub-type-classes for ICF labels