Added hierarchical context support.