Added back 'mapP', but deprecated