Added recursive mapping