Added support for generic interfaces.