Few upgrades to zmap files import