Add support for hierarchical decoding