Revise interface for larger map, support new country file format