diff --git a/lib/rolify.rb b/lib/rolify.rb
index 6d2f4c16..3e5df3f7 100644
--- a/lib/rolify.rb
+++ b/lib/rolify.rb
@@ -24,10 +24,13 @@ def rolify(options = {})
     self.role_join_table_name = options[:role_join_table_name]
 
     rolify_options = { :class_name => options[:role_cname].camelize }
-    rolify_options.merge!({ :join_table => self.role_join_table_name }) if Rolify.orm == "active_record"
     rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove, :inverse_of ].include? k.to_sym })
 
-    has_and_belongs_to_many :roles, **rolify_options
+    join_table_options = { }
+    join_table_options.merge!(options.reject{ |k,v| ![ :as ].include? k.to_sym })
+
+    has_many self.role_join_table_name.to_sym, dependent: :destroy, **join_table_options
+    has_many :roles, through: self.role_join_table_name.to_sym, **rolify_options
 
     self.adapter = Rolify::Adapter::Base.create("role_adapter", self.role_cname, self.name)