Improvement on the main server structure,