Efficiency

Use Text for Struct names and store types in HashSets instead of Sets