server module improved