Refactored OICP upstream services