updateMapping returns map instead of string[]
(refactoring needed!!)