Replace Option<&str> with Option<String> in public-facing functions