New map method and other fixes