Added class loader functions