Improved embedded map