Some refactors pending to be integrated in osc check repo