Improves Map events