diff --git a/.gitignore b/.gitignore
index 48612b14..65ce1101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ target
 *.iml
 .idea
 *.*~
+src-gen
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 1bfdecd1..3a677e49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,20 +3,3 @@ jdk:
 - oraclejdk8
 sudo: true
 script: mvn clean install
-before_install:
-- sudo apt-get update -qq
-- sudo apt-get install -y wget tar make openssl
-install:
-- mkdir tools
-- cd tools
-- wget http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.8.1.tar.gz
-- tar -xzf EventStore-OSS-Ubuntu-14.04-v3.8.1.tar.gz
-- cd EventStore-OSS-Ubuntu-14.04-v3.8.1
-- openssl req -x509 -sha256 -nodes -days 365 -subj "/CN=test.com" -newkey rsa:2048 -keyout domain.pem -out domain.csr
-- openssl pkcs12 -passout "pass:" -export -inkey domain.pem -in domain.csr -out domain.p12
-- ./run-node.sh --mem-db --stats-period-sec 3000 --ext-tcp-port 7773 --ext-secure-tcp-port 7779 --certificate-file domain.p12 > /dev/null &
-- cd ../
-- wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-- tar -xzf protobuf-2.6.1.tar.gz
-- cd protobuf-2.6.1 && ./configure --prefix=/usr && make > /dev/null 2>&1 && sudo make install > /dev/null 2>&1
-- cd ../../
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 98d43b23..30134cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,13 @@
     </dependencies>
 
     <build>
+		<extensions>
+			<extension>
+				<groupId>kr.motd.maven</groupId>
+				<artifactId>os-maven-plugin</artifactId>
+				<version>1.3.0.Final</version>
+			</extension>
+		</extensions>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -130,30 +137,25 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>compile-proto</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <mkdir dir="${project.build.directory}/generated-sources/protobuf"/>
-                                <exec executable="protoc">
-                                    <arg value="--java_out=${project.build.directory}/generated-sources/protobuf"/>
-                                    <arg value="--proto_path=${project.basedir}/src/main/protobuf"/>
-                                    <arg value="${project.basedir}/src/main/protobuf/EventStoreClientMessages.proto"/>
-                                </exec>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+				<groupId>org.xolstice.maven.plugins</groupId>
+				<artifactId>protobuf-maven-plugin</artifactId>
+				<version>0.5.0</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<clearOutputDirectory>false</clearOutputDirectory>
+							<protoSourceRoot>${project.basedir}/src/main/protobuf</protoSourceRoot>
+							<outputDirectory>${project.basedir}/src-gen/main/protobuf</outputDirectory>
+							<protocArtifact>com.google.protobuf:protoc:2.6.1:exe:${os.detected.classifier}</protocArtifact>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -166,7 +168,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${project.build.directory}/generated-sources/protobuf</source>
+                                <source>${project.basedir}/src-gen/main/protobuf</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -200,6 +202,31 @@
                     </execution>
                 </executions>
             </plugin>
+			<plugin>    
+			    <groupId>org.fuin.esmp</groupId>
+			    <artifactId>es-maven-plugin</artifactId>
+			    <version>0.4.1</version>
+			    <executions>
+			        <execution>
+			            <goals>
+			                <goal>download</goal>
+			                <goal>certificate</goal>
+			                <goal>start</goal>
+			                <goal>stop</goal>
+			            </goals>
+			        </execution>
+			    </executions>
+			    <configuration>
+			        <certificate-file>${project.build.directory}/domain.p12</certificate-file>
+			        <arguments>                  
+			            <argument>--mem-db=TRUE</argument>
+			            <argument>--stats-period-sec=3000</argument>
+			            <argument>--ext-tcp-port=7773</argument>
+			            <argument>--ext-secure-tcp-port=7779</argument>
+			            <argument>--certificate-file=${project.build.directory}/domain.p12</argument>
+			        </arguments>
+			    </configuration>
+			</plugin>            
         </plugins>
     </build>