diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bb0ded..c04d020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Add batch write/read (using FileChannel) with customizable batch size;
 - Add concurrent access to queue (methods with `synchronized` keyword or based on locks).
 
+## [2.0.2](https://github.com/infobip/popout/releases/tag/2.0.2) - 2019-04-19
+
+### Changed
+
+- Refactored dependencies management.
+
 ## [2.0.1](https://github.com/infobip/popout/releases/tag/2.0.1) - 2019-04-17
 
 ### Added
diff --git a/README.md b/README.md
index fccb2de..984bb90 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Include the dependency to your project's pom.xml file:
     <dependency>
         <groupId>org.infobip.lib</groupId>
         <artifactId>popout</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </dependency>
     ...
 </dependencies>
@@ -55,7 +55,7 @@ Include the dependency to your project's pom.xml file:
 or Gradle:
 
 ```groovy
-compile 'org.infobip.lib:poput:2.0.1'
+compile 'org.infobip.lib:poput:2.0.2'
 ```
 
 ### Create a queue
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index dcc8aee..6684768 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>org.infobip.lib</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>
@@ -33,17 +33,11 @@ limitations under the License.
   <name>[popout]: Benchmark tests</name>
 
   <dependencies>
-    <dependency>
-      <groupId>io.appulse</groupId>
-      <artifactId>logging-java</artifactId>
-      <version>1.1.1</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>popout</artifactId>
-      <version>2.0.1</version>
+      <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>com.squareup.tape2</groupId>
       <artifactId>tape</artifactId>
@@ -55,13 +49,18 @@ limitations under the License.
       <artifactId>jmh-core</artifactId>
       <version>1.21</version>
     </dependency>
-
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-generator-annprocess</artifactId>
       <version>1.21</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/benchmarks/src/main/java/org/infobip/lib/popout/benchmarks/Main.java b/benchmarks/src/main/java/org/infobip/lib/popout/benchmarks/Main.java
deleted file mode 100644
index 14aebe9..0000000
--- a/benchmarks/src/main/java/org/infobip/lib/popout/benchmarks/Main.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.infobip.lib.popout.benchmarks;
-
-import static io.appulse.utils.SizeUnit.MEGABYTES;
-import static java.util.Comparator.reverseOrder;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.concurrent.ThreadLocalRandom;
-
-import org.infobip.lib.popout.CompressedFilesConfig;
-import org.infobip.lib.popout.Deserializer;
-import org.infobip.lib.popout.FileQueue;
-import org.infobip.lib.popout.QueueLimit;
-import org.infobip.lib.popout.Serializer;
-import org.infobip.lib.popout.WalFilesConfig;
-import org.infobip.lib.popout.batched.BatchedFileQueueBuilder;
-
-import lombok.SneakyThrows;
-import lombok.val;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class Main {
-
-  private static final Path TEST_FILES = Paths.get("./tests_files");
-
-  public static void main (String[] args) throws Exception {
-    deleteFolder(TEST_FILES);
-    Files.createDirectories(TEST_FILES);
-
-    byte[] payload = new byte[512];
-    ThreadLocalRandom.current().nextBytes(payload);
-    val builder = queueBuilder();
-
-    try (val queue = builder.build()) {
-      log.info("Creating temporary files for READ benchmark tests");
-      for (int i = 0; i < 25_000_000; i++) {
-        queue.add(payload);
-      }
-      log.info("Creating files end");
-
-      log.info("Start polling");
-      do {
-        try {
-          val item = queue.poll();
-          if (item == null) {
-            break;
-          }
-        } catch (Throwable ex) {
-          log.error("ERROR", ex);
-          System.exit(1);
-        }
-      } while (true);
-      log.info("End polling");
-    }
-  }
-
-  private static BatchedFileQueueBuilder<byte[]> queueBuilder () {
-    return FileQueue.<byte[]>batched()
-        .name("my-test")
-        .folder(TEST_FILES)
-        .serializer(Serializer.BYTE_ARRAY)
-        .deserializer(Deserializer.BYTE_ARRAY)
-        .limit(QueueLimit.noLimit())
-        .restoreFromDisk(false)
-        .wal(WalFilesConfig.builder()
-            .folder(TEST_FILES)
-            .maxCount(1000)
-            .build())
-        .compressed(CompressedFilesConfig.builder()
-            .folder(TEST_FILES)
-            .maxSizeBytes(MEGABYTES.toBytes(256))
-            .build())
-        .batchSize(10_000);
-  }
-
-  @SneakyThrows
-  private static void deleteFolder (Path path) {
-    if (Files.notExists(path)) {
-      return;
-    }
-
-    Files.walk(path)
-        .sorted(reverseOrder())
-        .map(Path::toFile)
-        .forEach(File::delete);
-  }
-}
diff --git a/pom.xml b/pom.xml
index 32bba73..c32e513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
 
   <groupId>org.infobip.lib</groupId>
   <artifactId>parent</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -71,7 +71,7 @@ limitations under the License.
     <url>https://github.com/infobip/popout</url>
     <connection>scm:git:https://github.com/infobip/popout.git</connection>
     <developerConnection>scm:git:https://github.com/infobip/popout.git</developerConnection>
-    <tag>2.0.1</tag>
+    <tag>2.0.2</tag>
   </scm>
 
   <distributionManagement>
@@ -103,66 +103,65 @@ limitations under the License.
     </developer>
   </developers>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.6</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.4.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <version>5.4.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>3.12.2</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.25.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <version>2.25.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>net.jcip</groupId>
-      <artifactId>jcip-annotations</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <version>3.1.12</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.appulse</groupId>
+        <artifactId>utils-java</artifactId>
+        <version>1.15.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <version>1.18.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>5.4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>5.4.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>3.12.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>2.25.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-junit-jupiter</artifactId>
+        <version>2.25.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.jcip</groupId>
+        <artifactId>jcip-annotations</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-annotations</artifactId>
+        <version>3.1.12</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <build>
     <pluginManagement>
diff --git a/popout/pom.xml b/popout/pom.xml
index 59f0101..8b07e57 100644
--- a/popout/pom.xml
+++ b/popout/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>org.infobip.lib</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
 
   <artifactId>popout</artifactId>
@@ -36,7 +36,56 @@ limitations under the License.
     <dependency>
       <groupId>io.appulse</groupId>
       <artifactId>utils-java</artifactId>
-      <version>1.15.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>