Refactor external intents.