Add mapping code complexity and duplication