Map & List improvement