Changed objects to tuples and used new fieldPairs macro.