Updated automatic resolve