Changed mapper behaviour.