Added CHANGE_AFTER_RESET state handling