Add comment parsing