Added patsubst and readded old map as ProxyFile#simpleMap