Updated partner service to use manager & gateway