Initial support for Partner API