Further improvements to interface hierarchy