Refactor IntentBuilders