Improve extra handling logic.