Added handling specifically for strings