Adding mapping of Array Struct fields