Change a major data structure to keep track of client info