Further refactoring changes for special characters