(FIX) Implement port in soap calls as well