Replaced std::pair with struct.