Switched from raw tuple to namedtuple