Modified mapping