Added extend keyword and lexer definition