Change Plugin mapping to a recursive mapping