Improved map