make mapper work with incoming instance