clearer server config handling