Add multi-dimension arrays and returning structs