before moving server entities to server module