Add support for underscore in identifiers