Fixed the issue with struct fields not marshaling
Fixed the issue with struct fields not marshaling