Improving Maps Logic