Added/changed some Key's to prevent dublicate entries
Also add ServerId to the toal block stats