Reworked server architecturea