added support for Identifier recognition and cursor position