Adjust server module to changes