Add support for interfaces