Fixed new maps and zips
Fixed new call to .keys