Removing classQname and using typeQname