Added support for more special characters