Changes to hierarchy system of entites