Added remaining message types, and stats