Added typesafe resolver