Added support for struct tags