TLPORTAL-129: refactored code to separate providers for ESB and data