Added logic to separate RFC and SOAP calls
Kept standard RFD function calls