GRAILS-10473: Changed variable name from list to map