Fixed Class Type modifier parsing