Added recursive mapping to ObjectMapping