Updated statemachine files