Tidied Class Feature/Ability wc and added Class name to RefType Label