Use MD5s again and always map successful directories