Merge "Add support for input maps"