Add ad hoc support for generating interface hierarchies as well