diff --git a/daemon/mgmt/segment-publisher.cpp b/daemon/mgmt/segment-publisher.cpp
index fefe30e..82ae31e 100644
--- a/daemon/mgmt/segment-publisher.cpp
+++ b/daemon/mgmt/segment-publisher.cpp
@@ -33,7 +33,7 @@
 SegmentPublisher::publish()
 {
   Name segmentPrefix(m_prefix);
-  segmentPrefix.appendSegment(time::toUnixTimestamp(time::system_clock::now()).count());
+  segmentPrefix.appendVersion();
 
   static const size_t  MAX_SEGMENT_SIZE = MAX_NDN_PACKET_SIZE >> 1;
 
diff --git a/daemon/mgmt/status-server.cpp b/daemon/mgmt/status-server.cpp
index 61a67b1..df9309d 100644
--- a/daemon/mgmt/status-server.cpp
+++ b/daemon/mgmt/status-server.cpp
@@ -25,10 +25,8 @@
 StatusServer::onInterest(const Interest& interest) const
 {
   Name name(DATASET_PREFIX);
-  /// \todo use NumberComponent
-  name.append(Name::Component::fromNumberWithMarker(
-    time::toUnixTimestamp(time::system_clock::now()).count(), 0x00));
-  name.append(Name::Component::fromNumberWithMarker(0, 0x00));
+  name.appendVersion();
+  name.appendSegment(0);
 
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setFreshnessPeriod(RESPONSE_FRESHNESS);