Refactoring proposal to session aware intents.