Added more fields for server testing.