Added some implementation of reworked hierarchy