Added support for additional special characters