Added support for Companies