Improvements for target's own map