Adding support for struct tags

Much cleaner this time around :smile: