fixed map and zip import