Improve Map & Manager