Added support for companies