diff --git a/wxdata/include/scwx/wsr88d/ar2v_file.hpp b/wxdata/include/scwx/wsr88d/ar2v_file.hpp
index b79372df..90702e8e 100644
--- a/wxdata/include/scwx/wsr88d/ar2v_file.hpp
+++ b/wxdata/include/scwx/wsr88d/ar2v_file.hpp
@@ -32,8 +32,9 @@ public:
    Ar2vFile(Ar2vFile&&) noexcept;
    Ar2vFile& operator=(Ar2vFile&&) noexcept;
 
-   uint32_t julian_date() const;
-   uint32_t milliseconds() const;
+   uint32_t    julian_date() const;
+   uint32_t    milliseconds() const;
+   std::string icao() const;
 
    std::chrono::system_clock::time_point start_time() const;
    std::chrono::system_clock::time_point end_time() const;
diff --git a/wxdata/include/scwx/wsr88d/level3_file.hpp b/wxdata/include/scwx/wsr88d/level3_file.hpp
index 54b9ada1..181ac8f6 100644
--- a/wxdata/include/scwx/wsr88d/level3_file.hpp
+++ b/wxdata/include/scwx/wsr88d/level3_file.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <scwx/awips/wmo_header.hpp>
 #include <scwx/wsr88d/nexrad_file.hpp>
 #include <scwx/wsr88d/rpg/level3_message.hpp>
 
@@ -25,6 +26,7 @@ public:
    Level3File(Level3File&&) noexcept;
    Level3File& operator=(Level3File&&) noexcept;
 
+   std::shared_ptr<awips::WmoHeader>   wmo_header() const;
    std::shared_ptr<rpg::Level3Message> message() const;
 
    bool LoadFile(const std::string& filename);
diff --git a/wxdata/source/scwx/wsr88d/ar2v_file.cpp b/wxdata/source/scwx/wsr88d/ar2v_file.cpp
index 827918fe..d8555014 100644
--- a/wxdata/source/scwx/wsr88d/ar2v_file.cpp
+++ b/wxdata/source/scwx/wsr88d/ar2v_file.cpp
@@ -72,6 +72,12 @@ uint32_t Ar2vFile::milliseconds() const
 {
    return p->milliseconds_;
 }
+
+std::string Ar2vFile::icao() const
+{
+   return p->icao_;
+}
+
 std::chrono::system_clock::time_point Ar2vFile::start_time() const
 {
    return util::TimePoint(p->julianDate_, p->milliseconds_);
diff --git a/wxdata/source/scwx/wsr88d/level3_file.cpp b/wxdata/source/scwx/wsr88d/level3_file.cpp
index 43b04751..27d62b3c 100644
--- a/wxdata/source/scwx/wsr88d/level3_file.cpp
+++ b/wxdata/source/scwx/wsr88d/level3_file.cpp
@@ -1,5 +1,4 @@
 #include <scwx/wsr88d/level3_file.hpp>
-#include <scwx/awips/wmo_header.hpp>
 #include <scwx/wsr88d/rpg/ccb_header.hpp>
 #include <scwx/wsr88d/rpg/level3_message_factory.hpp>
 
@@ -39,6 +38,11 @@ Level3File::~Level3File() = default;
 Level3File::Level3File(Level3File&&) noexcept = default;
 Level3File& Level3File::operator=(Level3File&&) noexcept = default;
 
+std::shared_ptr<awips::WmoHeader> Level3File::wmo_header() const
+{
+   return p->wmoHeader_;
+}
+
 std::shared_ptr<rpg::Level3Message> Level3File::message() const
 {
    return p->message_;