add class loader checks