Custom mapping can now override base mapping