Added support for interfaces