Added unicode support for identifiers