Added more Features to lexical analyser