Updated solution with YR-provider and new WS implementation