improved server adding