Handle escaping of keywords

Need to find out a way to remove special treatment of 'new' keyword