Add Consumer class. Update Lexer class for stability.