added cloning of mapping