Restructured Stage Machine and Event System