Use objects instead of tuples