diff --git a/management/server/core/environment-metadata-manager/environment-metadata-manager-impl/src/main/java/io/subutai/core/environment/metadata/impl/EnvironmentMetadataManagerImpl.java b/management/server/core/environment-metadata-manager/environment-metadata-manager-impl/src/main/java/io/subutai/core/environment/metadata/impl/EnvironmentMetadataManagerImpl.java
index 5c16a86b090..f2b95da18cb 100644
--- a/management/server/core/environment-metadata-manager/environment-metadata-manager-impl/src/main/java/io/subutai/core/environment/metadata/impl/EnvironmentMetadataManagerImpl.java
+++ b/management/server/core/environment-metadata-manager/environment-metadata-manager-impl/src/main/java/io/subutai/core/environment/metadata/impl/EnvironmentMetadataManagerImpl.java
@@ -22,6 +22,7 @@
 
 
 /**
+ * Environment metadata manager
  **/
 public class EnvironmentMetadataManagerImpl implements EnvironmentMetadataManager
 {
diff --git a/management/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/MetaData.java b/management/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/MetaData.java
index 10f1a0067a6..fa7863f2b0e 100644
--- a/management/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/MetaData.java
+++ b/management/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/MetaData.java
@@ -51,17 +51,11 @@ public SourceMeta getSource()
     }
 
 
-    public List<Meta> getAllMeta()
-    {
-        return this.items;
-    }
-
-
     public List<CustomMeta> getCustomMetaByKey( String key )
     {
         final List<CustomMeta> result =
-                this.items.stream().filter( m -> m instanceof CustomMeta ).map( CustomMeta.class::cast )
-                          .filter( m -> m.getKey().equals( key ) ).collect( Collectors.toList() );
+                getMetaByObjectClass( CustomMeta.class ).stream().filter( m -> m.getKey().equals( key ) )
+                                                        .collect( Collectors.toList() );
         return result;
     }
 
@@ -80,7 +74,7 @@ private <T extends Meta> List<T> getMetaByObjectClass( Class<T> objectClass )
     }
 
 
-    public void addMeta( final Meta meta )
+    void addMeta( final Meta meta )
     {
         Preconditions.checkNotNull( meta );
         this.items.add( meta );