diff --git a/.gitignore b/.gitignore
index 61753c5..dc9d808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,4 +188,5 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
\ No newline at end of file
+ModelManifest.xml
+*.userprefs
diff --git a/LiquidState/Configuration/AwaitableStateConfigurationHelper.cs b/LiquidState/Configuration/AwaitableStateConfigurationHelper.cs
index bb50dd5..b768f4f 100644
--- a/LiquidState/Configuration/AwaitableStateConfigurationHelper.cs
+++ b/LiquidState/Configuration/AwaitableStateConfigurationHelper.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Threading.Tasks;
 using LiquidState.Common;
 using LiquidState.Representations;
@@ -84,7 +85,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentry<TArgume
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentry(TTrigger trigger,
-            Func<Task> onEntryAsyncAction)
+                                                                                 Func<Task> onEntryAsyncAction)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -103,7 +104,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentry<TArgume
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<bool> predicate,
-            TTrigger trigger)
+                                                                                   TTrigger trigger)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -112,7 +113,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<Task<bool>> predicate,
-            TTrigger trigger)
+                                                                                   TTrigger trigger)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -121,8 +122,8 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<bool> predicate,
-            TTrigger trigger,
-            Action onEntryAction)
+                                                                                   TTrigger trigger,
+                                                                                   Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -131,8 +132,8 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            Action<TArgument> onEntryAction)
+                                                                                              ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                              Action<TArgument> onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -141,7 +142,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf<TArgu
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<Task<bool>> predicate,
-            TTrigger trigger, Action onEntryAction)
+                                                                                   TTrigger trigger, Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -168,7 +169,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> Permit(TTrigger trigg
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> Permit(TTrigger trigger, TState resultingState,
-            Action onEntryAction)
+                                                                          Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -187,7 +188,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> Permit<TArgument>(
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> Permit(TTrigger trigger, TState resultingState,
-            Func<Task> onEntryAsyncAction)
+                                                                          Func<Task> onEntryAsyncAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -206,7 +207,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> Permit<TArgument>(
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate, TTrigger trigger,
-            TState resultingState)
+                                                                            TState resultingState)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -215,7 +216,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> p
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<Task<bool>> predicate, TTrigger trigger,
-            TState resultingState)
+                                                                            TState resultingState)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -224,7 +225,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<Task<bo
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate, TTrigger trigger,
-            TState resultingState, Action onEntryAction)
+                                                                            TState resultingState, Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -233,8 +234,8 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> p
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Action<TArgument> onEntryAction)
+                                                                                       ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                       TState resultingState, Action<TArgument> onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -243,7 +244,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(F
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<Task<bool>> predicate, TTrigger trigger,
-            TState resultingState, Action onEntryAction)
+                                                                            TState resultingState, Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -252,8 +253,8 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<Task<bo
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(Func<Task<bool>> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Action<TArgument> onEntryAction)
+                                                                                       ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                       TState resultingState, Action<TArgument> onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -262,7 +263,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(F
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate, TTrigger trigger,
-            TState resultingState, Func<Task> onEntryAsyncAction)
+                                                                            TState resultingState, Func<Task> onEntryAsyncAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -271,8 +272,8 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> p
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Func<TArgument, Task> onEntryAsyncAction)
+                                                                                       ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                       TState resultingState, Func<TArgument, Task> onEntryAsyncAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -281,7 +282,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(F
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<Task<bool>> predicate, TTrigger trigger,
-            TState resultingState, Func<Task> onEntryAsyncAction)
+                                                                            TState resultingState, Func<Task> onEntryAsyncAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -290,8 +291,8 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf(Func<Task<bo
         }
 
         public AwaitableStateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(Func<Task<bool>> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Func<TArgument, Task> onEntryAsyncAction)
+                                                                                       ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                       TState resultingState, Func<TArgument, Task> onEntryAsyncAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -321,7 +322,7 @@ public AwaitableStateConfigurationHelper<TState, TTrigger> IgnoreIf(Func<Task<bo
         }
 
         internal static AwaitableStateRepresentation<TState, TTrigger> FindOrCreateStateRepresentation(TState state,
-            Dictionary<TState, AwaitableStateRepresentation<TState, TTrigger>> config)
+                                                                                                       Dictionary<TState, AwaitableStateRepresentation<TState, TTrigger>> config)
         {
             Contract.Requires(state != null);
             Contract.Requires(config != null);
@@ -331,7 +332,8 @@ internal static AwaitableStateRepresentation<TState, TTrigger> FindOrCreateState
             AwaitableStateRepresentation<TState, TTrigger> rep;
             if (config.TryGetValue(state, out rep))
             {
-                if (rep != null) return rep;
+                if (rep != null)
+                    return rep;
             }
             rep = new AwaitableStateRepresentation<TState, TTrigger>(state);
 
@@ -340,36 +342,58 @@ internal static AwaitableStateRepresentation<TState, TTrigger> FindOrCreateState
             return rep;
         }
 
-        internal static AwaitableTriggerRepresentation<TTrigger, TState> FindOrCreateTriggerConfig(TTrigger trigger,
-            AwaitableStateRepresentation<TState, TTrigger> stateRepresentation)
+        internal static AwaitableTriggerRepresentation<TTrigger, TState> FindOrCreateTriggerRepresentation(TTrigger trigger,
+                                                                                                           object predicate,
+                                                                                                           AwaitableStateRepresentation<TState, TTrigger> stateRepresentation)
         {
             Contract.Requires(stateRepresentation != null);
             Contract.Requires(trigger != null);
 
             Contract.Ensures(Contract.Result<AwaitableTriggerRepresentation<TTrigger, TState>>() != null);
 
-            var rep = FindTriggerRepresentation(trigger, stateRepresentation);
-            if (rep != null) return rep;
+            var repList = FindTriggerRepresentation(trigger, stateRepresentation);
+            if (repList != null && repList.Count == 1)
+            {
+                var rep = repList[0];
+                if (rep.ConditionalTriggerPredicate == predicate)
+                {
+                    Contract.Assume(rep.Trigger != null);
+                    return rep;
+                }
+            }
+                
+            foreach (var rep in repList)
+            {
+                if (rep.Trigger.Equals(trigger) &&
+                    rep.ConditionalTriggerPredicate == predicate)
+                {
+                    Contract.Assume(rep.Trigger != null);
+                    return rep;
+                }
+            }
 
-            rep = new AwaitableTriggerRepresentation<TTrigger, TState>(trigger);
-            stateRepresentation.Triggers.Add(rep);
-            return rep;
+            var newRep = new AwaitableTriggerRepresentation<TTrigger, TState>(trigger);
+            stateRepresentation.Triggers.Add(newRep, null);
+            return newRep;
         }
 
-        internal static AwaitableTriggerRepresentation<TTrigger, TState> FindTriggerRepresentation(TTrigger trigger,
-            AwaitableStateRepresentation<TState, TTrigger> stateRepresentation)
+        internal static List<AwaitableTriggerRepresentation<TTrigger, TState>> FindTriggerRepresentation(TTrigger trigger,
+                                                                                                         AwaitableStateRepresentation<TState, TTrigger> stateRepresentation)
         {
-            return stateRepresentation.Triggers.Find(x => x.Trigger.Equals(trigger));
+            var list = from state in stateRepresentation.Triggers
+                                where state.Key.Trigger.Equals(trigger)
+                                select state.Key;
+            return list.ToList();
         }
 
         private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalSync(Func<bool> predicate,
-            TTrigger trigger,
-            TState resultingState, Action onEntryAction)
+                                                                                       TTrigger trigger,
+                                                                                       TState resultingState, Action onEntryAction)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAction;
@@ -379,15 +403,15 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalSync(F
         }
 
         private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalSync<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Action<TArgument> onEntryAction)
+                                                                                                  ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                                  TState resultingState, Action<TArgument> onEntryAction)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
             Contract.Assume(trigger.Trigger != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger.Trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger.Trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAction;
@@ -397,13 +421,13 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalSync<T
         }
 
         private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalAsync(Func<Task<bool>> predicate,
-            TTrigger trigger,
-            TState resultingState, Func<Task> onEntryAsyncAction)
+                                                                                        TTrigger trigger,
+                                                                                        TState resultingState, Func<Task> onEntryAsyncAction)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAsyncAction;
@@ -424,7 +448,7 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalAsync<
 
             Contract.Assume(trigger.Trigger != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger.Trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger.Trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAsyncAction;
@@ -436,13 +460,13 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalAsync<
         }
 
         private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalTriggerAsync(Func<bool> predicate,
-            TTrigger trigger,
-            TState resultingState, Func<Task> onEntryAsyncAction)
+                                                                                               TTrigger trigger,
+                                                                                               TState resultingState, Func<Task> onEntryAsyncAction)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAsyncAction;
@@ -462,7 +486,7 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalTrigge
 
             Contract.Assume(trigger.Trigger != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger.Trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger.Trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAsyncAction;
@@ -480,7 +504,7 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalPredic
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAsyncAction;
@@ -500,7 +524,7 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalPredic
 
             Contract.Assume(trigger.Trigger != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger.Trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger.Trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAsyncAction;
@@ -511,11 +535,11 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> PermitInternalPredic
         }
 
         private AwaitableStateConfigurationHelper<TState, TTrigger> IgnoreInternal(Func<bool> predicate,
-            TTrigger trigger)
+                                                                                   TTrigger trigger)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = null;
             rep.ConditionalTriggerPredicate = predicate;
@@ -529,7 +553,7 @@ private AwaitableStateConfigurationHelper<TState, TTrigger> IgnoreInternalPredic
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
 
-            var rep = FindOrCreateTriggerConfig(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = null;
             rep.ConditionalTriggerPredicate = predicate;
diff --git a/LiquidState/Configuration/StateConfigurationHelper.cs b/LiquidState/Configuration/StateConfigurationHelper.cs
index da8bc73..c77ecc4 100644
--- a/LiquidState/Configuration/StateConfigurationHelper.cs
+++ b/LiquidState/Configuration/StateConfigurationHelper.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using LiquidState.Common;
 using LiquidState.Representations;
 
@@ -17,7 +18,7 @@ public class StateConfigurationHelper<TState, TTrigger>
         private readonly StateRepresentation<TState, TTrigger> currentStateRepresentation;
 
         internal StateConfigurationHelper(Dictionary<TState, StateRepresentation<TState, TTrigger>> config,
-            TState currentState)
+                                          TState currentState)
         {
             Contract.Requires(config != null);
             Contract.Requires(currentState != null);
@@ -25,7 +26,6 @@ internal StateConfigurationHelper(Dictionary<TState, StateRepresentation<TState,
             Contract.Ensures(this.config != null);
             Contract.Ensures(currentStateRepresentation != null);
 
-
             this.config = config;
             currentStateRepresentation = FindOrCreateStateRepresentation(currentState, config);
         }
@@ -76,7 +76,7 @@ public StateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<bool> pre
         }
 
         public StateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<bool> predicate, TTrigger trigger,
-            Action onEntryAction)
+                                                                          Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -85,8 +85,8 @@ public StateConfigurationHelper<TState, TTrigger> PermitReentryIf(Func<bool> pre
         }
 
         public StateConfigurationHelper<TState, TTrigger> PermitReentryIf<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            Action<TArgument> onEntryAction)
+                                                                                     ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                     Action<TArgument> onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Assume(currentStateRepresentation.State != null);
@@ -117,7 +117,7 @@ public StateConfigurationHelper<TState, TTrigger> IgnoreIf(Func<bool> predicate,
         }
 
         public StateConfigurationHelper<TState, TTrigger> Permit(TTrigger trigger, TState resultingState,
-            Action onEntryAction)
+                                                                 Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -136,7 +136,7 @@ public StateConfigurationHelper<TState, TTrigger> Permit<TArgument>(
         }
 
         public StateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate, TTrigger trigger,
-            TState resultingState)
+                                                                   TState resultingState)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -145,7 +145,7 @@ public StateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate,
         }
 
         public StateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate, TTrigger trigger,
-            TState resultingState, Action onEntryAction)
+                                                                   TState resultingState, Action onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -154,8 +154,8 @@ public StateConfigurationHelper<TState, TTrigger> PermitIf(Func<bool> predicate,
         }
 
         public StateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Action<TArgument> onEntryAction)
+                                                                              ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                              TState resultingState, Action<TArgument> onEntryAction)
         {
             Contract.Requires(trigger != null);
             Contract.Requires(resultingState != null);
@@ -164,7 +164,7 @@ public StateConfigurationHelper<TState, TTrigger> PermitIf<TArgument>(Func<bool>
         }
 
         internal static StateRepresentation<TState, TTrigger> FindOrCreateStateRepresentation(TState state,
-            Dictionary<TState, StateRepresentation<TState, TTrigger>> config)
+                                                                                              Dictionary<TState, StateRepresentation<TState, TTrigger>> config)
         {
             Contract.Requires(state != null);
             Contract.Requires(config != null);
@@ -184,38 +184,56 @@ internal static StateRepresentation<TState, TTrigger> FindOrCreateStateRepresent
         }
 
         internal static TriggerRepresentation<TTrigger, TState> FindOrCreateTriggerRepresentation(TTrigger trigger,
-            StateRepresentation<TState, TTrigger> stateRepresentation)
+                                                                                                  Func<bool> predicate,
+                                                                                                  StateRepresentation<TState, TTrigger> stateRepresentation)
         {
             Contract.Requires(stateRepresentation != null);
             Contract.Requires(trigger != null);
 
             Contract.Ensures(Contract.Result<TriggerRepresentation<TTrigger, TState>>() != null);
 
-            var rep = FindTriggerRepresentation(trigger, stateRepresentation);
-            if (rep != null)
+            var repList = FindTriggerRepresentation(trigger, stateRepresentation);
+            if (repList != null && repList.Count == 1)
             {
-                Contract.Assume(rep.Trigger != null);
-                return rep;
+                var rep = repList[0];
+                if (rep.ConditionalTriggerPredicate == predicate)
+                {
+                    Contract.Assume(rep.Trigger != null);
+                    return rep;
+                }
+            }
+                
+            foreach (var rep in repList)
+            {
+                if (rep.Trigger.Equals(trigger) &&
+                    rep.ConditionalTriggerPredicate == predicate)
+                {
+                    Contract.Assume(rep.Trigger != null);
+                    return rep;
+                }
             }
 
-            rep = new TriggerRepresentation<TTrigger, TState>(trigger);
-            stateRepresentation.Triggers.Add(rep);
-            return rep;
+            var newRep = new TriggerRepresentation<TTrigger, TState>(trigger);
+            stateRepresentation.Triggers.Add(newRep, null);
+            return newRep;
         }
 
-        internal static TriggerRepresentation<TTrigger, TState> FindTriggerRepresentation(TTrigger trigger,
-            StateRepresentation<TState, TTrigger> stateRepresentation)
+        internal static List<TriggerRepresentation<TTrigger, TState>> FindTriggerRepresentation(TTrigger trigger,
+                                                                                                StateRepresentation<TState, TTrigger> stateRepresentation)
         {
-            return stateRepresentation.Triggers.Find(x => x.Trigger.Equals(trigger));
+            var list = from state in stateRepresentation.Triggers
+                                where state.Key.Trigger.Equals(trigger)
+                                select state.Key;
+            return list.ToList();
         }
 
         private StateConfigurationHelper<TState, TTrigger> PermitInternal(Func<bool> predicate, TTrigger trigger,
-            TState resultingState, Action onEntryAction)
+                                                                          TState resultingState, Action onEntryAction)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
-            var rep = FindOrCreateTriggerRepresentation(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAction;
@@ -225,15 +243,15 @@ private StateConfigurationHelper<TState, TTrigger> PermitInternal(Func<bool> pre
         }
 
         private StateConfigurationHelper<TState, TTrigger> PermitInternal<TArgument>(Func<bool> predicate,
-            ParameterizedTrigger<TTrigger, TArgument> trigger,
-            TState resultingState, Action<TArgument> onEntryAction)
+                                                                                     ParameterizedTrigger<TTrigger, TArgument> trigger,
+                                                                                     TState resultingState, Action<TArgument> onEntryAction)
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
             Contract.Requires<ArgumentNullException>(resultingState != null);
 
             Contract.Assume(trigger.Trigger != null);
 
-            var rep = FindOrCreateTriggerRepresentation(trigger.Trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger.Trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = FindOrCreateStateRepresentation(resultingState, config);
             rep.OnTriggerAction = onEntryAction;
@@ -246,7 +264,7 @@ private StateConfigurationHelper<TState, TTrigger> IgnoreInternal(Func<bool> pre
         {
             Contract.Requires<ArgumentNullException>(trigger != null);
 
-            var rep = FindOrCreateTriggerRepresentation(trigger, currentStateRepresentation);
+            var rep = FindOrCreateTriggerRepresentation(trigger, predicate, currentStateRepresentation);
 
             rep.NextStateRepresentation = null;
             rep.ConditionalTriggerPredicate = predicate;
diff --git a/LiquidState/Machines/AwaitableStateMachine.cs b/LiquidState/Machines/AwaitableStateMachine.cs
index 8bbe39a..fc06206 100644
--- a/LiquidState/Machines/AwaitableStateMachine.cs
+++ b/LiquidState/Machines/AwaitableStateMachine.cs
@@ -1,4 +1,4 @@
-// Author: Prasanna V. Loganathar
+// Author: Prasanna V. Loganathar
 // Created: 2:12 AM 27-11-2014
 // Project: LiquidState
 // License: http://www.apache.org/licenses/LICENSE-2.0
@@ -22,7 +22,7 @@ public class AwaitableStateMachine<TState, TTrigger> : IAwaitableStateMachine<TS
         private readonly Dictionary<TState, AwaitableStateRepresentation<TState, TTrigger>> configDictionary;
 
         internal AwaitableStateMachine(TState initialState,
-            AwaitableStateMachineConfiguration<TState, TTrigger> configuration)
+                                       AwaitableStateMachineConfiguration<TState, TTrigger> configuration)
         {
             Contract.Requires(configuration != null);
             Contract.Requires(initialState != null);
@@ -45,7 +45,8 @@ public async Task MoveToState(TState state, StateTransitionOption option = State
             {
                 try
                 {
-                    if (!IsEnabled) return;
+                    if (!IsEnabled)
+                        return;
                     await MoveToStateInternal(state, option).ConfigureAwait(false);
                 }
                 finally
@@ -65,16 +66,16 @@ public async Task<bool> CanHandleTriggerAsync(TTrigger trigger)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.Trigger.Equals(trigger))
+                if (current.Key.Trigger.Equals(trigger))
                 {
-                    if ((CheckFlag(current.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask)))
+                    if ((CheckFlag(current.Key.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask)))
                     {
-                        var predicate = current.ConditionalTriggerPredicate as Func<Task<bool>>;
+                        var predicate = current.Key.ConditionalTriggerPredicate as Func<Task<bool>>;
                         return predicate == null || await predicate();
                     }
                     else
                     {
-                        var predicate = current.ConditionalTriggerPredicate as Func<bool>;
+                        var predicate = current.Key.ConditionalTriggerPredicate as Func<bool>;
                         return predicate == null || predicate();
                     }
                 }
@@ -86,7 +87,7 @@ public bool CanTransitionTo(TState state)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.NextStateRepresentation.State.Equals(state))
+                if (current.Key.NextStateRepresentation.State.Equals(state))
                     return true;
             }
 
@@ -104,13 +105,14 @@ public void Resume()
         }
 
         public async Task FireAsync<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameterizedTrigger,
-            TArgument argument)
+                                               TArgument argument)
         {
             if (Monitor.TryEnter())
             {
                 try
                 {
-                    if (!IsEnabled) return;
+                    if (!IsEnabled)
+                        return;
                     await FireInternalAsync(parameterizedTrigger, argument).ConfigureAwait(false);
                 }
                 finally
@@ -132,7 +134,8 @@ public async Task FireAsync(TTrigger trigger)
             {
                 try
                 {
-                    if (!IsEnabled) return;
+                    if (!IsEnabled)
+                        return;
                     await FireInternalAsync(trigger).ConfigureAwait(false);
                 }
                 finally
@@ -162,7 +165,7 @@ public IEnumerable<TTrigger> CurrentPermittedTriggers
         {
             get
             {
-                foreach (var triggerRepresentation in CurrentStateRepresentation.Triggers)
+                foreach (var triggerRepresentation in CurrentStateRepresentation.Triggers.Keys)
                 {
                     yield return triggerRepresentation.Trigger;
                 }
@@ -239,43 +242,75 @@ internal async Task PerformStopTransitionAsync()
         }
 
         internal async Task FireInternalAsync<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameterizedTrigger,
-            TArgument argument)
+                                                         TArgument argument)
         {
             var trigger = parameterizedTrigger.Trigger;
             var triggerRep =
                 AwaitableStateConfigurationHelper<TState, TTrigger>.FindTriggerRepresentation(trigger,
                     CurrentStateRepresentation);
 
-            if (triggerRep == null)
+            if (triggerRep == null || triggerRep.Count == 0)
             {
                 HandleInvalidTrigger(trigger);
                 return;
             }
 
-            if (CheckFlag(triggerRep.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask))
+            AwaitableTriggerRepresentation<TTrigger, TState> rep = null;
+
+            foreach (var item in triggerRep)
             {
-                var predicate = (Func<Task<bool>>) triggerRep.ConditionalTriggerPredicate;
-                if (predicate != null)
-                    if (!await predicate())
+                if (CheckFlag(item.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask))
+                {
+                    var predicate = (Func<Task<bool>>)item.ConditionalTriggerPredicate;
+                    if (predicate == null)
                     {
-                        HandleInvalidTrigger(trigger);
-                        return;
+                        if (triggerRep.Count > 1)
+                        {
+                            throw new InvalidOperationException("Default triggers and conditional triggers cannot be used on the same resulting state");
+                        }
+
+                        rep = item;
                     }
-            }
-            else
-            {
-                var predicate = (Func<bool>) triggerRep.ConditionalTriggerPredicate;
-                if (predicate != null)
-                    if (!predicate())
+                    else
                     {
-                        HandleInvalidTrigger(trigger);
-                        return;
+                        if (await predicate() && rep == null)
+                        {
+                            rep = item;
+                        }
+                    }
+                }
+                else
+                {
+                    var predicate = (Func<bool>)item.ConditionalTriggerPredicate;
+
+                    if (predicate == null)
+                    {
+                        if (triggerRep.Count > 1)
+                        {
+                            throw new InvalidOperationException("Defaul triggers and conditional triggers cannot be used on the same resulting state");
+                        }
+
+                        rep = item;
+                    }
+                    else
+                    {
+                        if (predicate() && rep == null)
+                        {
+                            rep = item;
+                        }
                     }
+                }
+            }
+
+            if (rep == null)
+            {
+                HandleInvalidTrigger(trigger);
+                return;
             }
 
             // Handle ignored trigger
 
-            if (triggerRep.NextStateRepresentation == null)
+            if (rep.NextStateRepresentation == null)
             {
                 return;
             }
@@ -284,11 +319,11 @@ internal async Task FireInternalAsync<TArgument>(ParameterizedTrigger<TTrigger,
 
             Action<TArgument> triggerAction = null;
             Func<TArgument, Task> triggerFunc = null;
-            if (CheckFlag(triggerRep.TransitionFlags, AwaitableStateTransitionFlag.TriggerActionReturnsTask))
+            if (CheckFlag(rep.TransitionFlags, AwaitableStateTransitionFlag.TriggerActionReturnsTask))
             {
                 try
                 {
-                    triggerFunc = (Func<TArgument, Task>) triggerRep.OnTriggerAction;
+                    triggerFunc = (Func<TArgument, Task>)rep.OnTriggerAction;
                 }
                 catch (InvalidCastException)
                 {
@@ -300,7 +335,7 @@ internal async Task FireInternalAsync<TArgument>(ParameterizedTrigger<TTrigger,
             {
                 try
                 {
-                    triggerAction = (Action<TArgument>) triggerRep.OnTriggerAction;
+                    triggerAction = (Action<TArgument>)rep.OnTriggerAction;
                 }
                 catch (InvalidCastException)
                 {
@@ -312,15 +347,15 @@ internal async Task FireInternalAsync<TArgument>(ParameterizedTrigger<TTrigger,
             // Current exit
 
             if (CheckFlag(CurrentStateRepresentation.TransitionFlags,
-                AwaitableStateTransitionFlag.ExitReturnsTask))
+                    AwaitableStateTransitionFlag.ExitReturnsTask))
             {
-                var exit = (Func<Task>) CurrentStateRepresentation.OnExitAction;
+                var exit = (Func<Task>)CurrentStateRepresentation.OnExitAction;
                 if (exit != null)
                     await exit();
             }
             else
             {
-                var exit = (Action) CurrentStateRepresentation.OnExitAction;
+                var exit = (Action)CurrentStateRepresentation.OnExitAction;
                 if (exit != null)
                     exit();
             }
@@ -338,17 +373,17 @@ internal async Task FireInternalAsync<TArgument>(ParameterizedTrigger<TTrigger,
 
             // Next state entry
 
-            var nextStateRep = triggerRep.NextStateRepresentation;
+            var nextStateRep = rep.NextStateRepresentation;
 
             if (CheckFlag(nextStateRep.TransitionFlags, AwaitableStateTransitionFlag.EntryReturnsTask))
             {
-                var entry = (Func<Task>) nextStateRep.OnEntryAction;
+                var entry = (Func<Task>)nextStateRep.OnEntryAction;
                 if (entry != null)
                     await entry();
             }
             else
             {
-                var entry = (Action) nextStateRep.OnEntryAction;
+                var entry = (Action)nextStateRep.OnEntryAction;
                 if (entry != null)
                     entry();
             }
@@ -371,36 +406,68 @@ internal async Task FireInternalAsync(TTrigger trigger)
                 AwaitableStateConfigurationHelper<TState, TTrigger>.FindTriggerRepresentation(trigger,
                     CurrentStateRepresentation);
 
-            if (triggerRep == null)
+            if (triggerRep == null || triggerRep.Count == 0)
             {
                 HandleInvalidTrigger(trigger);
                 return;
             }
 
-            if (CheckFlag(triggerRep.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask))
+            AwaitableTriggerRepresentation<TTrigger, TState> rep = null;
+
+            foreach (var item in triggerRep)
             {
-                var predicate = (Func<Task<bool>>) triggerRep.ConditionalTriggerPredicate;
-                if (predicate != null)
-                    if (!await predicate())
+                if (CheckFlag(item.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask))
+                {
+                    var predicate = (Func<Task<bool>>)item.ConditionalTriggerPredicate;
+                    if (predicate == null)
                     {
-                        HandleInvalidTrigger(trigger);
-                        return;
+                        if (triggerRep.Count > 1)
+                        {
+                            throw new InvalidOperationException("Defaul triggers and conditional triggers cannot be used on the same resulting state");
+                        }
+
+                        rep = item;
                     }
-            }
-            else
-            {
-                var predicate = (Func<bool>) triggerRep.ConditionalTriggerPredicate;
-                if (predicate != null)
-                    if (!predicate())
+                    else
                     {
-                        HandleInvalidTrigger(trigger);
-                        return;
+                        if (await predicate() && rep == null)
+                        {
+                            rep = item;
+                        }
+                    }
+                }
+                else
+                {
+                    var predicate = (Func<bool>)item.ConditionalTriggerPredicate;
+
+                    if (predicate == null)
+                    {
+                        if (triggerRep.Count > 1)
+                        {
+                            throw new InvalidOperationException("Defaul triggers and conditional triggers cannot be used on the same resulting state");
+                        }
+
+                        rep = item;
                     }
+                    else
+                    {
+                        if (predicate() && rep == null)
+                        {
+                            rep = item;
+                        }
+                    }
+                }
+            }
+
+            if (rep == null)
+            {
+                HandleInvalidTrigger(trigger);
+                return;
             }
 
             // Handle ignored trigger
 
-            if (triggerRep.NextStateRepresentation == null)
+            if (rep.NextStateRepresentation == null)
             {
                 return;
             }
@@ -409,11 +476,11 @@ internal async Task FireInternalAsync(TTrigger trigger)
 
             Action triggerAction = null;
             Func<Task> triggerFunc = null;
-            if (CheckFlag(triggerRep.TransitionFlags, AwaitableStateTransitionFlag.TriggerActionReturnsTask))
+            if (CheckFlag(rep.TransitionFlags, AwaitableStateTransitionFlag.TriggerActionReturnsTask))
             {
                 try
                 {
-                    triggerFunc = (Func<Task>) triggerRep.OnTriggerAction;
+                    triggerFunc = (Func<Task>)rep.OnTriggerAction;
                 }
                 catch (InvalidCastException)
                 {
@@ -425,7 +492,7 @@ internal async Task FireInternalAsync(TTrigger trigger)
             {
                 try
                 {
-                    triggerAction = (Action) triggerRep.OnTriggerAction;
+                    triggerAction = (Action)rep.OnTriggerAction;
                 }
                 catch (InvalidCastException)
                 {
@@ -437,16 +504,17 @@ internal async Task FireInternalAsync(TTrigger trigger)
             // Current exit
 
             if (CheckFlag(CurrentStateRepresentation.TransitionFlags,
-                AwaitableStateTransitionFlag.ExitReturnsTask))
+                    AwaitableStateTransitionFlag.ExitReturnsTask))
             {
-                var exit = (Func<Task>) CurrentStateRepresentation.OnExitAction;
+                var exit = (Func<Task>)CurrentStateRepresentation.OnExitAction;
                 if (exit != null)
                     await exit();
             }
             else
             {
-                var exit = (Action) CurrentStateRepresentation.OnExitAction;
-                if (exit != null) exit();
+                var exit = (Action)CurrentStateRepresentation.OnExitAction;
+                if (exit != null)
+                    exit();
             }
 
             // Trigger entry
@@ -462,18 +530,19 @@ internal async Task FireInternalAsync(TTrigger trigger)
 
             // Next state entry
 
-            var nextStateRep = triggerRep.NextStateRepresentation;
+            var nextStateRep = rep.NextStateRepresentation;
 
             if (CheckFlag(nextStateRep.TransitionFlags, AwaitableStateTransitionFlag.EntryReturnsTask))
             {
-                var entry = (Func<Task>) nextStateRep.OnEntryAction;
+                var entry = (Func<Task>)nextStateRep.OnEntryAction;
                 if (entry != null)
                     await entry();
             }
             else
             {
-                var entry = (Action) nextStateRep.OnEntryAction;
-                if (entry != null) entry();
+                var entry = (Action)nextStateRep.OnEntryAction;
+                if (entry != null)
+                    entry();
             }
 
             // Set states
@@ -484,13 +553,15 @@ internal async Task FireInternalAsync(TTrigger trigger)
             // Raise event
 
             var sc = StateChanged;
-            if (sc != null) sc.Invoke(previousState, CurrentStateRepresentation.State);
+            if (sc != null)
+                sc.Invoke(previousState, CurrentStateRepresentation.State);
         }
 
         private void HandleInvalidTrigger(TTrigger trigger)
         {
             var handler = UnhandledTriggerExecuted;
-            if (handler != null) handler.Invoke(trigger, CurrentStateRepresentation.State);
+            if (handler != null)
+                handler.Invoke(trigger, CurrentStateRepresentation.State);
         }
 
         private bool CheckFlag(AwaitableStateTransitionFlag source, AwaitableStateTransitionFlag flagToCheck)
diff --git a/LiquidState/Machines/BlockingStateMachine.cs b/LiquidState/Machines/BlockingStateMachine.cs
index aa8cbf7..d967031 100644
--- a/LiquidState/Machines/BlockingStateMachine.cs
+++ b/LiquidState/Machines/BlockingStateMachine.cs
@@ -1,4 +1,4 @@
-// Author: Prasanna V. Loganathar
+// Author: Prasanna V. Loganathar
 // Created: 2:12 AM 27-11-2014
 // Project: LiquidState
 // License: http://www.apache.org/licenses/LICENSE-2.0
@@ -41,7 +41,8 @@ public void MoveToState(TState state, StateTransitionOption option = StateTransi
         {
             lock (syncRoot)
             {
-                if (!IsEnabled) return;
+                if (!IsEnabled)
+                    return;
                 StateRepresentation<TState, TTrigger> rep;
                 if (configDictionary.TryGetValue(state, out rep))
                 {
@@ -69,9 +70,9 @@ public bool CanHandleTrigger(TTrigger trigger)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.Trigger.Equals(trigger))
+                if (current.Key.Trigger.Equals(trigger))
                 {
-                    var predicate = current.ConditionalTriggerPredicate;
+                    var predicate = current.Key.ConditionalTriggerPredicate;
                     return predicate == null || predicate();
                 }
             }
@@ -82,7 +83,7 @@ public bool CanTransitionTo(TState state)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.NextStateRepresentation.State.Equals(state))
+                if (current.Key.NextStateRepresentation.State.Equals(state))
                     return true;
             }
 
@@ -103,32 +104,51 @@ public void Fire<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameteri
         {
             lock (syncRoot)
             {
-                if (!IsEnabled) return;
+                if (!IsEnabled)
+                    return;
                 var trigger = parameterizedTrigger.Trigger;
                 var triggerRep = StateConfigurationHelper<TState, TTrigger>.FindTriggerRepresentation(trigger,
-                    CurrentStateRepresentation);
+                                     CurrentStateRepresentation);
 
-                if (triggerRep == null)
+                if (triggerRep == null || triggerRep.Count == 0)
                 {
                     HandleInvalidTrigger(trigger);
                     return;
                 }
 
                 var previousState = CurrentState;
+                TriggerRepresentation<TTrigger, TState> rep = null;
 
-                var predicate = triggerRep.ConditionalTriggerPredicate;
-                if (predicate != null)
+                foreach (var item in triggerRep)
                 {
-                    if (!predicate())
+                    var predicate = item.ConditionalTriggerPredicate;
+                    if (predicate == null)
+                    {
+                        if (triggerRep.Count > 1)
+                        {
+                            throw new InvalidOperationException("Default triggers and conditional triggers cannot be used on the same resulting state");
+                        }
+
+                        rep = item;
+                    }
+                    else
                     {
-                        HandleInvalidTrigger(trigger);
-                        return;
+                        if (predicate() && rep == null)
+                        {
+                            rep = item;
+                        }
                     }
                 }
 
+                if (rep == null)
+                {
+                    HandleInvalidTrigger(trigger);
+                    return;
+                }
+
                 // Handle ignored trigger
 
-                if (triggerRep.NextStateRepresentation == null)
+                if (rep.NextStateRepresentation == null)
                 {
                     return;
                 }
@@ -138,7 +158,7 @@ public void Fire<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameteri
                 Action<TArgument> triggerAction = null;
                 try
                 {
-                    triggerAction = (Action<TArgument>) triggerRep.OnTriggerAction;
+                    triggerAction = (Action<TArgument>)rep.OnTriggerAction;
                 }
                 catch (InvalidCastException)
                 {
@@ -152,10 +172,11 @@ public void Fire<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameteri
                 ExecuteAction(currentExit);
 
                 // Trigger entry
-                if (triggerAction != null) triggerAction.Invoke(argument);
+                if (triggerAction != null)
+                    triggerAction.Invoke(argument);
 
 
-                var nextStateRep = triggerRep.NextStateRepresentation;
+                var nextStateRep = rep.NextStateRepresentation;
 
                 // Next entry
                 var nextEntry = nextStateRep.OnEntryAction;
@@ -174,31 +195,50 @@ public void Fire(TTrigger trigger)
         {
             lock (syncRoot)
             {
-                if (!IsEnabled) return;
+                if (!IsEnabled)
+                    return;
                 var triggerRep = StateConfigurationHelper<TState, TTrigger>.FindTriggerRepresentation(trigger,
-                    CurrentStateRepresentation);
+                                     CurrentStateRepresentation);
 
-                if (triggerRep == null)
+                if (triggerRep == null || triggerRep.Count == 0)
                 {
                     HandleInvalidTrigger(trigger);
                     return;
                 }
 
                 var previousState = CurrentState;
+                TriggerRepresentation<TTrigger, TState> rep = null;
 
-                var predicate = triggerRep.ConditionalTriggerPredicate;
-                if (predicate != null)
+                foreach (var item in triggerRep)
                 {
-                    if (!predicate())
+                    var predicate = item.ConditionalTriggerPredicate;
+                    if (predicate == null)
                     {
-                        HandleInvalidTrigger(trigger);
-                        return;
+                        if (triggerRep.Count > 1)
+                        {
+                            throw new InvalidOperationException("Defaul triggers and conditional triggers cannot be used on the same resulting state");
+                        }
+
+                        rep = item;
                     }
+                    else
+                    {
+                        if (predicate() && rep == null)
+                        {
+                            rep = item;
+                        }
+                    }
+                }
+
+                if (rep == null)
+                {
+                    HandleInvalidTrigger(trigger);
+                    return;
                 }
 
                 // Handle ignored trigger
 
-                if (triggerRep.NextStateRepresentation == null)
+                if (rep.NextStateRepresentation == null)
                 {
                     return;
                 }
@@ -208,7 +248,7 @@ public void Fire(TTrigger trigger)
                 Action triggerAction = null;
                 try
                 {
-                    triggerAction = (Action) triggerRep.OnTriggerAction;
+                    triggerAction = (Action)rep.OnTriggerAction;
                 }
                 catch (InvalidCastException)
                 {
@@ -224,7 +264,7 @@ public void Fire(TTrigger trigger)
                 // Trigger entry
                 ExecuteAction(triggerAction);
 
-                var nextStateRep = triggerRep.NextStateRepresentation;
+                var nextStateRep = rep.NextStateRepresentation;
 
                 // Next entry
                 var nextEntry = nextStateRep.OnEntryAction;
@@ -253,7 +293,7 @@ public IEnumerable<TTrigger> CurrentPermittedTriggers
         {
             get
             {
-                foreach (var triggerRepresentation in CurrentStateRepresentation.Triggers)
+                foreach (var triggerRepresentation in CurrentStateRepresentation.Triggers.Keys)
                 {
                     yield return triggerRepresentation.Trigger;
                 }
@@ -267,13 +307,15 @@ public bool IsEnabled
 
         private void ExecuteAction(Action action)
         {
-            if (action != null) action.Invoke();
+            if (action != null)
+                action.Invoke();
         }
 
         private void HandleInvalidTrigger(TTrigger trigger)
         {
             var handler = UnhandledTriggerExecuted;
-            if (handler != null) handler.Invoke(trigger, CurrentStateRepresentation.State);
+            if (handler != null)
+                handler.Invoke(trigger, CurrentStateRepresentation.State);
         }
     }
 }
diff --git a/LiquidState/Machines/StateMachine.cs b/LiquidState/Machines/StateMachine.cs
index c9ffdf0..a77b0db 100644
--- a/LiquidState/Machines/StateMachine.cs
+++ b/LiquidState/Machines/StateMachine.cs
@@ -1,4 +1,4 @@
-// Author: Prasanna V. Loganathar
+// Author: Prasanna V. Loganathar
 // Created: 2:12 AM 27-11-2014
 // Project: LiquidState
 // License: http://www.apache.org/licenses/LICENSE-2.0
@@ -43,7 +43,8 @@ public void MoveToState(TState state, StateTransitionOption option = StateTransi
             {
                 try
                 {
-                    if (!IsEnabled) return;
+                    if (!IsEnabled)
+                        return;
                     StateRepresentation<TState, TTrigger> rep;
                     if (configDictionary.TryGetValue(state, out rep))
                     {
@@ -81,9 +82,9 @@ public bool CanHandleTrigger(TTrigger trigger)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.Trigger.Equals(trigger))
+                if (current.Key.Trigger.Equals(trigger))
                 {
-                    var predicate = current.ConditionalTriggerPredicate;
+                    var predicate = current.Key.ConditionalTriggerPredicate;
                     return predicate == null || predicate();
                 }
             }
@@ -94,7 +95,7 @@ public bool CanTransitionTo(TState state)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.NextStateRepresentation.State.Equals(state))
+                if (current.Key.NextStateRepresentation.State.Equals(state))
                     return true;
             }
 
@@ -117,32 +118,51 @@ public void Fire<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameteri
             {
                 try
                 {
-                    if (!IsEnabled) return;
+                    if (!IsEnabled)
+                        return;
                     var trigger = parameterizedTrigger.Trigger;
                     var triggerRep = StateConfigurationHelper<TState, TTrigger>.FindTriggerRepresentation(trigger,
-                        CurrentStateRepresentation);
+                                         CurrentStateRepresentation);
 
-                    if (triggerRep == null)
+                    if (triggerRep == null || triggerRep.Count == 0)
                     {
                         HandleInvalidTrigger(trigger);
                         return;
                     }
 
                     var previousState = CurrentState;
+                    TriggerRepresentation<TTrigger, TState> rep = null;
 
-                    var predicate = triggerRep.ConditionalTriggerPredicate;
-                    if (predicate != null)
+                    foreach (var item in triggerRep)
                     {
-                        if (!predicate())
+                        var predicate = item.ConditionalTriggerPredicate;
+                        if (predicate == null)
+                        {
+                            if (triggerRep.Count > 1)
+                            {
+                                throw new InvalidOperationException("Defaul triggers and conditional triggers cannot be used on the same resulting state");
+                            }
+
+                            rep = item;
+                        }
+                        else
                         {
-                            HandleInvalidTrigger(trigger);
-                            return;
+                            if (predicate() && rep == null)
+                            {
+                                rep = item;
+                            }
                         }
                     }
 
+                    if (rep == null)
+                    {
+                        HandleInvalidTrigger(trigger);
+                        return;
+                    }
+
                     // Handle ignored trigger
 
-                    if (triggerRep.NextStateRepresentation == null)
+                    if (rep.NextStateRepresentation == null)
                     {
                         return;
                     }
@@ -152,7 +172,7 @@ public void Fire<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameteri
                     Action<TArgument> triggerAction = null;
                     try
                     {
-                        triggerAction = (Action<TArgument>) triggerRep.OnTriggerAction;
+                        triggerAction = (Action<TArgument>)rep.OnTriggerAction;
                     }
                     catch (InvalidCastException)
                     {
@@ -166,10 +186,11 @@ public void Fire<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameteri
                     ExecuteAction(currentExit);
 
                     // Trigger entry
-                    if (triggerAction != null) triggerAction.Invoke(argument);
+                    if (triggerAction != null)
+                        triggerAction.Invoke(argument);
 
 
-                    var nextStateRep = triggerRep.NextStateRepresentation;
+                    var nextStateRep = rep.NextStateRepresentation;
 
                     // Next entry
                     var nextEntry = nextStateRep.OnEntryAction;
@@ -200,31 +221,50 @@ public void Fire(TTrigger trigger)
             {
                 try
                 {
-                    if (!IsEnabled) return;
+                    if (!IsEnabled)
+                        return;
                     var triggerRep = StateConfigurationHelper<TState, TTrigger>.FindTriggerRepresentation(trigger,
-                        CurrentStateRepresentation);
+                                         CurrentStateRepresentation);
 
-                    if (triggerRep == null)
+                    if (triggerRep == null || triggerRep.Count == 0)
                     {
                         HandleInvalidTrigger(trigger);
                         return;
                     }
 
                     var previousState = CurrentState;
+                    TriggerRepresentation<TTrigger, TState> rep = null;
 
-                    var predicate = triggerRep.ConditionalTriggerPredicate;
-                    if (predicate != null)
+                    foreach (var item in triggerRep)
                     {
-                        if (!predicate())
+                        var predicate = item.ConditionalTriggerPredicate;
+                        if (predicate == null)
                         {
-                            HandleInvalidTrigger(trigger);
-                            return;
+                            if (triggerRep.Count > 1)
+                            {
+                                throw new InvalidOperationException("Default triggers and conditional triggers cannot be used on the same resulting state");
+                            }
+
+                            rep = item;
                         }
+                        else
+                        {
+                            if (predicate() && rep == null)
+                            {
+                                rep = item;
+                            }
+                        }
+                    }
+
+                    if (rep == null)
+                    {
+                        HandleInvalidTrigger(trigger);
+                        return;
                     }
 
                     // Handle ignored trigger
 
-                    if (triggerRep.NextStateRepresentation == null)
+                    if (rep.NextStateRepresentation == null)
                     {
                         return;
                     }
@@ -234,7 +274,7 @@ public void Fire(TTrigger trigger)
                     Action triggerAction = null;
                     try
                     {
-                        triggerAction = (Action) triggerRep.OnTriggerAction;
+                        triggerAction = (Action)rep.OnTriggerAction;
                     }
                     catch (InvalidCastException)
                     {
@@ -250,7 +290,7 @@ public void Fire(TTrigger trigger)
                     // Trigger entry
                     ExecuteAction(triggerAction);
 
-                    var nextStateRep = triggerRep.NextStateRepresentation;
+                    var nextStateRep = rep.NextStateRepresentation;
 
                     // Next entry
                     var nextEntry = nextStateRep.OnEntryAction;
@@ -289,7 +329,7 @@ public IEnumerable<TTrigger> CurrentPermittedTriggers
         {
             get
             {
-                foreach (var triggerRepresentation in CurrentStateRepresentation.Triggers)
+                foreach (var triggerRepresentation in CurrentStateRepresentation.Triggers.Keys)
                 {
                     yield return triggerRepresentation.Trigger;
                 }
@@ -303,13 +343,15 @@ public bool IsEnabled
 
         private void ExecuteAction(Action action)
         {
-            if (action != null) action.Invoke();
+            if (action != null)
+                action.Invoke();
         }
 
         private void HandleInvalidTrigger(TTrigger trigger)
         {
             var handler = UnhandledTriggerExecuted;
-            if (handler != null) handler.Invoke(trigger, CurrentStateRepresentation.State);
+            if (handler != null)
+                handler.Invoke(trigger, CurrentStateRepresentation.State);
         }
     }
 }
diff --git a/LiquidState/Representations/AwaitableStateRepresentation.cs b/LiquidState/Representations/AwaitableStateRepresentation.cs
index aca9aca..2c8b045 100644
--- a/LiquidState/Representations/AwaitableStateRepresentation.cs
+++ b/LiquidState/Representations/AwaitableStateRepresentation.cs
@@ -12,7 +12,7 @@ namespace LiquidState.Representations
     internal class AwaitableStateRepresentation<TState, TTrigger>
     {
         public readonly TState State;
-        public readonly List<AwaitableTriggerRepresentation<TTrigger, TState>> Triggers;
+        public readonly Dictionary<AwaitableTriggerRepresentation<TTrigger, TState>, Func<bool>> Triggers;
         public object OnEntryAction;
         public object OnExitAction;
         public AwaitableStateTransitionFlag TransitionFlags;
@@ -26,7 +26,7 @@ internal AwaitableStateRepresentation(TState state)
 
             State = state;
             // Allocate with capacity as 1 to avoid wastage of memory.
-            Triggers = new List<AwaitableTriggerRepresentation<TTrigger, TState>>(1);
+            Triggers = new Dictionary<AwaitableTriggerRepresentation<TTrigger, TState>, Func<bool>>(1);
         }
     }
 
diff --git a/LiquidState/Representations/Representation.cs b/LiquidState/Representations/Representation.cs
index 34daddf..06c87a9 100644
--- a/LiquidState/Representations/Representation.cs
+++ b/LiquidState/Representations/Representation.cs
@@ -12,7 +12,7 @@ namespace LiquidState.Representations
     internal class StateRepresentation<TState, TTrigger>
     {
         public readonly TState State;
-        public readonly List<TriggerRepresentation<TTrigger, TState>> Triggers;
+        public readonly Dictionary<TriggerRepresentation<TTrigger, TState>, Func<bool>> Triggers;
         public Action OnEntryAction;
         public Action OnExitAction;
 
@@ -23,7 +23,7 @@ internal StateRepresentation(TState state)
 
             State = state;
             // Allocate with capacity as 1 to avoid wastage of memory.
-            Triggers = new List<TriggerRepresentation<TTrigger, TState>>(1);
+            Triggers = new Dictionary<TriggerRepresentation<TTrigger, TState>, Func<bool>>(1);
         }
     }