Add support for index ranges in map #1080