Add multi server enviroment support