SES-2088 : Work on reducing reliance on HTTPRepository