Add comment type
Change parser to be more friendly