Remove struct tag requirement