Correcting server entities

Correcting server entities