Improve server config