Making the protocol works with general file names
update mapping