Moved init state logic to onEnter