Added extension methods and FSM System from unify