Extended options to include map and list