Use a struct rather than a 4-tuple