Add typesafe resolver