Add support for comments and numbers