Added `hierarchy` option