More typesafety