Changes for resolving if variable is String type