Improve named maps