Improved Map object