Rework server message handling