Improved map class