#34 Removed dot struct notation