Improvements to list map