Swapped vectors to a more tuple-like representation