More detailed mapping