Updated/New Composer support for FSM

See diff for full changes