Add special characters support