Reworked server architecture