added support for more partner attributes