First try of adding intermediary internal types representing input.