Add server clustering and exception handling