Fixed with new fields in Struct object