Improve server architecture