Adding support for interfaces.