Updated server
Removed duplicate EventEntry & UserEntry