Improves map support.