diff --git a/include/formats/hevc.hh b/include/formats/hevc.hh
index 6c0b588..b256808 100644
--- a/include/formats/hevc.hh
+++ b/include/formats/hevc.hh
@@ -41,8 +41,6 @@ namespace uvg_rtp {
             private:
                 rtp_error_t push_hevc_frame(uint8_t *data, size_t data_len);
                 rtp_error_t push_hevc_nal(uint8_t *data, size_t data_len, bool more);
-
-                uvg_rtp::frame_queue *fqueue_;
         };
     };
 };
diff --git a/include/formats/media.hh b/include/formats/media.hh
index 891bec9..2a8582e 100644
--- a/include/formats/media.hh
+++ b/include/formats/media.hh
@@ -4,6 +4,7 @@
 
 #include "../rtp.hh"
 #include "../socket.hh"
+#include "../queue.hh"
 #include "../util.hh"
 
 namespace uvg_rtp {
@@ -41,6 +42,7 @@ namespace uvg_rtp {
                 uvg_rtp::socket *socket_;
                 uvg_rtp::rtp *rtp_ctx_;
                 int flags_;
+                uvg_rtp::frame_queue *fqueue_;
         };
     };
 };
diff --git a/src/formats/hevc.cc b/src/formats/hevc.cc
index 8f50ac8..82125f7 100644
--- a/src/formats/hevc.cc
+++ b/src/formats/hevc.cc
@@ -434,7 +434,7 @@ end:
 }
 
 uvg_rtp::formats::hevc::hevc(uvg_rtp::socket *socket, uvg_rtp::rtp *rtp, int flags):
-    media(socket, rtp, flags), fqueue_(new uvg_rtp::frame_queue(socket, rtp, flags))
+    media(socket, rtp, flags)
 {
 }
 
diff --git a/src/formats/media.cc b/src/formats/media.cc
index c87009b..58d47c6 100644
--- a/src/formats/media.cc
+++ b/src/formats/media.cc
@@ -10,7 +10,7 @@
 #define INVALID_SEQ 0xffffffff
 
 uvg_rtp::formats::media::media(uvg_rtp::socket *socket, uvg_rtp::rtp *rtp_ctx, int flags):
-    socket_(socket), rtp_ctx_(rtp_ctx), flags_(flags)
+    socket_(socket), rtp_ctx_(rtp_ctx), flags_(flags), fqueue_(new uvg_rtp::frame_queue(socket, rtp_ctx, flags))
 {
 }
 
@@ -38,6 +38,42 @@ rtp_error_t uvg_rtp::formats::media::__push_frame(uint8_t *data, size_t data_len
 {
     (void)flags;
 
+    rtp_error_t ret;
+
+    if ((ret = fqueue_->init_transaction(data)) != RTP_OK) {
+        LOG_ERROR("Invalid frame queue or failed to initialize transaction!");
+        return ret;
+    }
+
+    /* TODO: Bring back the support for RCE_FRAGMENT_GENERIC
+     *       It requires support for modifying the active packet's RTP header,
+     *       functionality currently not provided by the frame queue */
+    if (data_len > rtp_ctx_->get_payload_size()) {
+        if (flags_ & RCE_FRAGMENT_GENERIC) {
+            LOG_ERROR("Generic frame fragmentation currently not supported!");
+            return RTP_NOT_SUPPORTED;
+        }
+
+        LOG_WARN("Payload is too large and will be truncated (%zu vs %zu)",
+            data_len, rtp_ctx_->get_payload_size()
+        );
+    }
+
+    if ((ret = fqueue_->enqueue_message(data, data_len)) != RTP_OK) {
+        LOG_ERROR("Failed to enqueue message: %d", ret);
+        (void)fqueue_->deinit_transaction();
+        return ret;
+    }
+
+    if ((ret = fqueue_->flush_queue()) != RTP_OK) {
+        LOG_ERROR("Failed to flush frame queue: %d", ret);
+        (void)fqueue_->deinit_transaction();
+        return ret;
+    }
+
+    return fqueue_->deinit_transaction();
+
+#if 0
     std::vector<std::pair<size_t, uint8_t *>> buffers;
     size_t payload_size = rtp_ctx_->get_payload_size();
     uint8_t header[uvg_rtp::frame::HEADER_SIZE_RTP];
@@ -87,9 +123,7 @@ rtp_error_t uvg_rtp::formats::media::__push_frame(uint8_t *data, size_t data_len
             LOG_WARN("Packet is larger (%zu bytes) than payload_size (%zu bytes)", data_len, payload_size);
         }
     }
-
-    rtp_ctx_->inc_sequence();
-    return socket_->sendto(buffers, 0);
+#endif
 }
 
 rtp_error_t uvg_rtp::formats::media::packet_handler(void *arg, int flags, uvg_rtp::frame::rtp_frame **out)