Added tuple to support remapToJs data structures