Change stats map to be a stats struct