Separated IntentMapper from IntentComponent