Adding draft Finite State Machine support