Replaced tuples with small immutable classes