Improved the mapper by adding the possibility to map nested arrays