diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/InvoiceQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/InvoiceQuery.java
index 7cd85f9d2..c40f5df4d 100644
--- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/InvoiceQuery.java
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/InvoiceQuery.java
@@ -78,4 +78,11 @@ public InvoiceQuery setCompany( Integer company )
         put( COMPANY, company );
         return this;
     }
+
+    public InvoiceQuery setMetadata( MetadataQuery metadata )
+    {
+        putAll( metadata );
+        return this;
+    }
+
 }
diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/MetadataQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/MetadataQuery.java
new file mode 100644
index 000000000..72917ae5f
--- /dev/null
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/MetadataQuery.java
@@ -0,0 +1,17 @@
+package com.cloudesire.platform.apiclient.query;
+
+import java.util.Map;
+
+public class MetadataQuery extends BaseQuery
+{
+    private static final String METADATA = "metadata";
+
+    public MetadataQuery setMetadata( Map<String, Object> metadata )
+    {
+        metadata.forEach( ( key, value ) -> {
+            if ( value == null ) value = "";
+            put( String.format( "%s[%s]", METADATA, key ), value );
+        } );
+        return this;
+    }
+}
diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java
index 01e7afd67..597dd1747 100644
--- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java
@@ -48,4 +48,11 @@ public OrderQuery setTo( Date to )
         put( TO, SimpleDateFormatFactory.dateFormat().format( to ) );
         return this;
     }
+
+    public OrderQuery setMetadata( MetadataQuery metadata )
+    {
+        putAll( metadata );
+        return this;
+    }
+
 }
diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java
index 14c6ff5a8..7071cbad9 100644
--- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java
@@ -5,36 +5,29 @@
 import com.cloudesire.platform.apiclient.dto.model.enums.ProductType;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Map;
-
 public class SubscriptionQuery extends PageRequestQuery
 {
     private static final String FILTER = "filter";
-    private static final String METADATA = "metadata";
     private static final String STATUS = "status";
     private static final String TYPE = "type";
     private static final String PRODUCT = "product";
     private static final String PRODUCT_TYPE = "productType";
 
-
     public SubscriptionQuery setPageRequest( PageRequestQuery pageRequestQuery )
     {
         putAll( pageRequestQuery );
         return this;
     }
 
-    public SubscriptionQuery setFilter( String value )
+    public SubscriptionQuery setMetadata( MetadataQuery metadata )
     {
-        put( FILTER, value );
+        putAll( metadata );
         return this;
     }
 
-    public SubscriptionQuery setMetadata( Map<String, Object> metadata )
+    public SubscriptionQuery setFilter( String value )
     {
-        metadata.forEach( ( key, value ) -> {
-            if ( value == null ) value = "";
-            put( String.format( "%s[%s]", METADATA, key ), value );
-        } );
+        put( FILTER, value );
         return this;
     }