diff --git a/Gemfile.lock b/Gemfile.lock
index 00ae792..dfd359c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    workflower (0.1.3)
+    workflower (0.2.1)
       activesupport (>= 6.0.0)
 
 GEM
diff --git a/lib/workflower/acts_as_workflower.rb b/lib/workflower/acts_as_workflower.rb
index f9629a6..2b8d23d 100644
--- a/lib/workflower/acts_as_workflower.rb
+++ b/lib/workflower/acts_as_workflower.rb
@@ -1,98 +1,98 @@
 module Workflower
-    mattr_accessor :workflower_state_column_name, :default_workflow_id
-    module ActsAsWorkflower
-        extend ActiveSupport::Concern
+  mattr_accessor :workflower_state_column_name, :default_workflow_id
+  module ActsAsWorkflower
+    extend ActiveSupport::Concern
 
-        module InstanceMethods 
-          #mattr_accessor :workflower_base
-          attr_accessor :possible_events, :allowed_events, :allowed_transitions
+    module InstanceMethods
+      # mattr_accessor :workflower_base
+      attr_accessor :possible_events, :allowed_events, :allowed_transitions, :workflow_transition_event_name, :workflow_transition_flow
 
-          def set_intial_state
-            write_attribute self.class.workflower_state_column_name, self.workflower_initial_state
+      def set_intial_state
+        write_attribute self.class.workflower_state_column_name, workflower_initial_state
+      end
+
+      def workflower_initial_state
+        workflower_base.set_initial_state
+      end
+
+      def workflower_base
+        @workflower_base
+      end
+
+      def source_workflow
+        @source_workflow_instance ||= source.new(self)
+        @source_workflow_instance.get_workflows_for_workflow_id(workflow_id)
+      end
+
+      def workflower_initializer
+        @source_workflow_instance ||= source.new(self)
+
+        @workflower_base ||= Workflower::Manager.new(self, @source_workflow_instance)
+
+        @workflower_base.allowed_transitions.each do |flow|
+          define_singleton_method flow.trigger_action_name.to_s do
+            @workflow_transition_event_name = flow.event
+            @workflow_transition_flow = flow
+            @workflower_base.process_transition!(flow)
           end
 
-          def workflower_initial_state
-            workflower_base.set_initial_state
-          end
-
-          def workflower_base
-            return @workflower_base
-          end
-
-          def source_workflow
-            @source_workflow_instance ||= self.source.new(self)
-            @source_workflow_instance.get_workflows_for_workflow_id(workflow_id)
-          end
-
-          def workflower_initializer
-            @source_workflow_instance ||= self.source.new(self)
-
-            @workflower_base ||= Workflower::Manager.new(self, @source_workflow_instance)
-            
-            @workflower_base.allowed_transitions.each do |flow|
-              define_singleton_method "#{flow.trigger_action_name}" do 
-                @workflower_base.process_transition!(flow)
-              end
-
-              define_singleton_method "#{flow.boolean_action_name}" do 
-                @workflower_base.transition_possible?(flow)
-              end
-            end
-
-            @possible_events     ||= @workflower_base.events
-            @allowed_events      ||= @workflower_base.allowed_events
-            @allowed_transitions ||= @workflower_base.allowed_transitions
-          end 
-
-          def initialize(*)
-            super 
-            write_attribute :workflow_id, self.default_workflow_id if workflow_id.blank?
-            
-            workflower_initializer
-            
+          define_singleton_method flow.boolean_action_name.to_s do
+            @workflower_base.transition_possible?(flow)
           end
         end
-        
-        
-        module ClassMethods
-          def workflower(workflower_state_column_name: "workflow_state", default_workflow_id:, source:)
-            raise Workflower::WorkflowerError.new("Options can't be blank") if source.blank? || default_workflow_id.blank?
-            cattr_accessor :source,                       default: source
-            cattr_accessor :workflower_state_column_name, default: workflower_state_column_name
-            cattr_accessor :default_workflow_id,          default: default_workflow_id
 
-            self.workflower_state_column_name = workflower_state_column_name
-            self.source                       = source
-            self.default_workflow_id          = default_workflow_id
-            
-            #self.validates  "#{workflow_model.tableize.singularize}_id", presence: true
-            self.before_create :set_intial_state
-            
+        @possible_events     ||= @workflower_base.events
+        @allowed_events      ||= @workflower_base.allowed_events
+        @allowed_transitions ||= @workflower_base.allowed_transitions
+      end
+
+      def initialize(*)
+        super
+        write_attribute :workflow_id, default_workflow_id if workflow_id.blank?
+
+        workflower_initializer
+      end
+    end
+
+    module ClassMethods
+      def workflower(default_workflow_id:, source:, workflower_state_column_name: "workflow_state")
+        raise Workflower::WorkflowerError, "Options can't be blank" if source.blank? || default_workflow_id.blank?
+
+        cattr_accessor :source,                       default: source
+        cattr_accessor :workflower_state_column_name, default: workflower_state_column_name
+        cattr_accessor :default_workflow_id,          default: default_workflow_id
+
+        self.workflower_state_column_name = workflower_state_column_name
+        self.source                       = source
+        self.default_workflow_id          = default_workflow_id
+
+        # self.validates  "#{workflow_model.tableize.singularize}_id", presence: true
+        before_create :set_intial_state
+      end
+
+      def workflower_abilities
+        load = source.new(new).get_workflows.values.flatten.uniq
+
+        unless load.blank?
+          # transitions = load.transitions.where("(metadata->>'roles') IS NOT NULL")
+          transitions = load.select { |item| item.try(:[], :metadata).try(:key?, :roles) }
+
+          roles = transitions.map { |item| item[:metadata][:roles] }.flatten.uniq
+
+          roles_hash = {}
+
+          roles.each do |role|
+            roles_hash[role] = transitions.select { |trans| trans[:metadata][:roles].to_a.include?(role) }.map { |item| item[:event] }.uniq
           end
 
-          def workflower_abilities
-            load = source.new(self.new).get_workflows.values.flatten.uniq
-
-            unless load.blank?
-              #transitions = load.transitions.where("(metadata->>'roles') IS NOT NULL") 
-              transitions = load.select { |item| item.try(:[], :metadata).try(:key?, :roles)}
-              
-              roles = transitions.map{ |item| item[:metadata][:roles] }.flatten.uniq
-
-              roles_hash = Hash.new
-
-              roles.each do |role|
-                roles_hash[role] = transitions.select { |trans| trans[:metadata][:roles].to_a.include?(role) }.map {|item| item[:event] }.uniq 
-              end
-
-              return roles_hash
-            end
-          end
+          roles_hash
         end
-        
-        def self.included(base)
-          base.send  :include, InstanceMethods
-          base.extend(ClassMethods)
-        end
-    end 
+      end
+    end
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.extend(ClassMethods)
+    end
+  end
 end
diff --git a/lib/workflower/version.rb b/lib/workflower/version.rb
index 58ce764..375f5e1 100644
--- a/lib/workflower/version.rb
+++ b/lib/workflower/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Workflower
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end