Add typesafe