Update Events building with state machine