Merge "Refactor InputMapper creation and collection type"