Adds classes for client stats, with tests