Two FSM builder added