Improved dependency hierarchy