Updated Monitor Mapper to use internal collection mapping