Added support for partners