Add a function to clone map and use it where appropriate

Add a function to clone map and use it where appropriate #2130