Version 3.1: Support for special characters