diff --git a/app/models/survey/attempt.rb b/app/models/survey/attempt.rb
index 57537b5..f6e4385 100644
--- a/app/models/survey/attempt.rb
+++ b/app/models/survey/attempt.rb
@@ -25,7 +25,7 @@ class Survey::Attempt < ActiveRecord::Base
   scope :for_survey, ->(survey) { where(:survey_id => survey.id) }
   scope :exclude_survey,  ->(survey) { where("NOT survey_id = #{survey.id}") }
   scope :for_participant, ->(participant) {
-    where(:participant_id => participant.try(:id), :participant_type => participant.class.base_class)
+    where(:participant_id => participant.try(:id), :participant_type => participant.class.base_class.to_s)
   }
 
   # callbacks
diff --git a/lib/generators/templates/migration.rb b/lib/generators/templates/migration.rb
index 24b239b..7c76ecd 100644
--- a/lib/generators/templates/migration.rb
+++ b/lib/generators/templates/migration.rb
@@ -1,4 +1,4 @@
-class CreateSurvey < ActiveRecord::Migration
+class CreateSurvey < ActiveRecord::Migration[4.2]
   def self.up
 
     # survey surveys logic
diff --git a/lib/survey.rb b/lib/survey.rb
index be0e532..459fe07 100644
--- a/lib/survey.rb
+++ b/lib/survey.rb
@@ -1,10 +1,14 @@
 module ::Kernel
+  def rails5?
+    return defined?(Rails) && Rails::VERSION::MAJOR == 5
+  end
+
   def rails4?
     return defined?(Rails) && Rails::VERSION::MAJOR == 4
   end
 
   def in_rails_3(&block)
-    yield if block_given? unless rails4?
+    yield if block_given? unless rails4? || rails5?
   end
 end
 
@@ -12,4 +16,4 @@ def in_rails_3(&block)
 require 'survey/version'
 require 'survey/active_record'
 
-ActiveRecord::Base.send(:include, Survey::ActiveRecord)
\ No newline at end of file
+ActiveRecord::Base.send(:include, Survey::ActiveRecord)
diff --git a/survey.gemspec b/survey.gemspec
index 31d8e3e..1b19534 100644
--- a/survey.gemspec
+++ b/survey.gemspec
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.authors     = %Q{Runtime Revolution}
   s.require_paths = %w(lib)
 
-  s.add_dependency("rails", [">= 3.2.6", "< 5"])
-  s.add_dependency("railties", ">= 3.2.6", "< 5")
+  s.add_dependency("rails", [">= 3.2.6", "< 6"])
+  s.add_dependency("railties", ">= 3.2.6", "< 6")
   s.add_development_dependency("mocha")
   s.add_development_dependency("faker")
   s.add_development_dependency("rake")