Added the ability to include multi-mappers.