Update for most recent resolver changes