Tweaking map functionality