Improved map functionality