Add option to force default server