Adding default server support