Properly fill partner context