diff --git a/Gemfile b/Gemfile
index ac9abf4..b4e2a20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,3 @@
 source "https://rubygems.org"
 
-gem "quickfix-jruby", "~>1.6.0"
-gem "anticipate"
-gem "cucumber", "~> 1.3"
-gem "fix_spec", "~> 0.4.1"
-gem "rspec", "~> 3.0"
-
-group :development do
-  gem "jeweler", "~> 1.8.8"
-  gem "rake", "~> 10.1"
-end
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 658dd08..4cb793d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,25 +1,35 @@
+PATH
+  remote: .
+  specs:
+    agent_fix (0.3.0)
+      anticipate
+      cucumber (~> 1.3)
+      fix_spec (>= 1.0.0)
+      quickfix-jruby (~> 1.6.0)
+      rspec (~> 3.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
     anticipate (0.1.1)
     builder (3.2.2)
-    cucumber (1.3.6)
+    cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.0)
-      multi_json (~> 1.7.5)
-      multi_test (>= 0.0.2)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
     cuke_mem (0.1.1)
       cucumber (~> 1.3)
     diff-lcs (1.2.5)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    fix_spec (0.4.1)
+    fix_spec (1.0.1)
       cuke_mem (~> 0.1.1)
       json_spec (~> 1.1.1)
       quickfix-jruby (~> 1.6.0)
-    gherkin (2.12.1-java)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
     git (1.2.6)
     github_api (0.10.1)
@@ -48,7 +58,7 @@ GEM
     jwt (0.1.8)
       multi_json (>= 1.5)
     multi_json (1.7.9)
-    multi_test (0.0.2)
+    multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10-java)
@@ -64,28 +74,27 @@ GEM
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  anticipate
-  cucumber (~> 1.3)
-  fix_spec (~> 0.4.1)
+  agent_fix!
   jeweler (~> 1.8.8)
-  quickfix-jruby (~> 1.6.0)
   rake (~> 10.1)
-  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.11.2
diff --git a/README.md b/README.md
index 5b2f4fe..8627667 100644
--- a/README.md
+++ b/README.md
@@ -39,12 +39,20 @@ Usage
 
 ### Configuration
 
-In order to use Agent FIX, in your `env.rb` you must:
+In order to use Agent FIX, you must:
 
 ```ruby
 require 'agent_fix'
 ```
 
+To use with cucumber, you must:
+
+```ruby
+# env.rb
+require 'agent_fix/cucumber'
+require 'agent_fix/cucumber/report'
+```
+
 You can define a data dictionary using FIX spec:
 
 ```ruby
diff --git a/VERSION b/VERSION
index f477849..0d91a54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.2
\ No newline at end of file
+0.3.0
diff --git a/agent_fix.gemspec b/agent_fix.gemspec
index 4583f05..d0b0ab7 100644
--- a/agent_fix.gemspec
+++ b/agent_fix.gemspec
@@ -6,81 +6,43 @@
 
 Gem::Specification.new do |s|
   s.name = "agent_fix"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Lane", "Chris Busbey", "Mike Gatny"]
   s.date = "2015-06-29"
   s.description = "Interact with FIX connections to send, receive, and inspect messages in cucumber"
   s.email = "info@connamara.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".travis.yml",
-    "CONTRIBUTION_GUIDELINES.md",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "QUICKFIX_LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "agent_fix.gemspec",
-    "config/fix_agents.rb",
-    "config/logging.properties",
-    "features/inspect_all.feature",
-    "features/scope.feature",
-    "features/step_definitions/steps.rb",
-    "features/support/FIX42.xml",
-    "features/support/FIX50SP1.xml",
-    "features/support/FIXT11.xml",
-    "features/support/env.rb",
-    "lib/agent_fix.rb",
-    "lib/agent_fix/agent.rb",
-    "lib/agent_fix/configuration.rb",
-    "lib/agent_fix/cucumber.rb",
-    "lib/agent_fix/cucumber/report.rb",
-    "lib/agent_fix/message_cache.rb",
-    "spec/agent_fix/configuration_spec.rb",
-    "spec/agent_fix/message_cache_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.extra_rdoc_files = ["LICENSE.txt", "README.md"]
+
+  s.files = Dir['lib/**/*',
+                'spec/**/*',
+                'features/**/*',
+                'config/*',
+                'vendor/**/*',
+                '*.gemspec',
+                '*.md',
+                'Gemfile',
+                'LICENSE.txt',
+                'QUICKFIX_LICENSE.txt',
+                'VERSION',
+                'Rakefile',
+                '.travis.yml']
+
+  s.test_files = s.files.grep(%r{^(spec|features)/})
+
   s.homepage = "http://github.com/connamara/agent_fix"
   s.licenses = ["GPL"]
   s.require_paths = ["lib"]
   s.rubygems_version = "2.1.9"
   s.summary = "Agent framework for FIX messages"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<quickfix-jruby>, ["~> 1.6.0"])
-      s.add_runtime_dependency(%q<anticipate>, [">= 0"])
-      s.add_runtime_dependency(%q<cucumber>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<fix_spec>, ["~> 0.4.1"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
-      s.add_development_dependency(%q<rake>, ["~> 10.1"])
-    else
-      s.add_dependency(%q<quickfix-jruby>, ["~> 1.6.0"])
-      s.add_dependency(%q<anticipate>, [">= 0"])
-      s.add_dependency(%q<cucumber>, ["~> 1.3"])
-      s.add_dependency(%q<fix_spec>, ["~> 0.4.1"])
-      s.add_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
-      s.add_dependency(%q<rake>, ["~> 10.1"])
-    end
-  else
-    s.add_dependency(%q<quickfix-jruby>, ["~> 1.6.0"])
-    s.add_dependency(%q<anticipate>, [">= 0"])
-    s.add_dependency(%q<cucumber>, ["~> 1.3"])
-    s.add_dependency(%q<fix_spec>, ["~> 0.4.1"])
-    s.add_dependency(%q<rspec>, ["~> 3.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
-    s.add_dependency(%q<rake>, ["~> 10.1"])
-  end
+  s.add_runtime_dependency(%q<quickfix-jruby>, ["~> 1.6.0"])
+  s.add_runtime_dependency(%q<anticipate>)
+  s.add_runtime_dependency(%q<cucumber>, ["~> 1.3"])
+  s.add_runtime_dependency(%q<fix_spec>, [">= 1.0.0"])
+  s.add_runtime_dependency(%q<rspec>, ["~> 3.0"])
+  s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
+  s.add_development_dependency(%q<rake>, ["~> 10.1"])
 end
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 98b6d88..d059de2 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,8 +1,9 @@
 $: << File.expand_path("../../../lib", __FILE__)
 
+require 'fix_spec'
+require 'fix_spec/cucumber'
 require 'agent_fix/cucumber'
 require 'agent_fix/cucumber/report'
-require 'fix_spec/cucumber'
 require 'rspec'
 require 'anticipate'
 
diff --git a/lib/agent_fix/cucumber.rb b/lib/agent_fix/cucumber.rb
index 47536b1..35a6cff 100644
--- a/lib/agent_fix/cucumber.rb
+++ b/lib/agent_fix/cucumber.rb
@@ -1,6 +1,6 @@
 require File.expand_path("../../agent_fix", __FILE__)
 
-require 'fix_spec/builder'
+require 'fix_spec'
 require 'fix_spec/cucumber'
 
 module FIXMessageCache