Refactored parsing of resolved service