Updated Server & EventEntry