Optimized the mapper to only notify base mappers