Added partial speciatisations to Class/Struct/Union detection