added optional remapping of collections