Added hierarchical mapping relationships