Adding some new classes for the FSM model