Add mapping code