Added map/array option for the List