Added modules to state machine