Improved hiearchy