Improving and harden the way precheck classes are loaded