Added class_loader