Added hierarchical contexts