Added FSM Service and Fixed Event Listeners Bugs