Add resolve_class_name in Utils