--- a/gemini_annotate.xml	Tue Feb 16 05:56:10 2016 -0500
+++ b/gemini_annotate.xml	Fri Dec 07 12:51:48 2018 -0500
@@ -1,4 +1,4 @@
-<tool id="gemini_@BINARY@" name="GEMINI @BINARY@" version="@VERSION@.0">
+<tool id="gemini_@BINARY@" name="GEMINI @BINARY@" version="@VERSION@.2">
     <description>adding your own custom annotations</description>
     <macros>
         <import>gemini_macros.xml</import>
@@ -10,11 +10,15 @@
     <command>
 <![CDATA[
 
-    bgzip -c "$annotate_source" > tabixed.gz &&
-    tabix -p bed tabixed.gz &&
+    ## For GEMINI to work correctly, tabixed file must have form [name].[bed|vcf].gz
+    #set $tabixed_file = "tabixed.%s.gz" % $annotate_source.ext
+    bgzip -c "$annotate_source" > $tabixed_file &&
+    tabix -p "$annotate_source.ext" $tabixed_file &&
+
+        @PROVIDE_ANNO_DATA@
 
         gemini @BINARY@
-            -f tabixed.gz
+            -f $tabixed_file
             -c $column_name
             -a $a.a_selector
             #if $a.a_selector == 'extract':
@@ -30,7 +34,7 @@
     </command>
     <inputs>
         <expand macro="infile" />
-        <param name="annotate_source" type="data" format="bed" label="File containing the annotations in BED format" help="(-f)"/>
+        <param name="annotate_source" type="data" format="vcf,bed" label="File containing the annotations in BED/VCF format" help="(-f)"/>
 
         <param name="column_name" type="text" value=""
             label="The name of the column to be added to the variant table" 
@@ -45,12 +49,12 @@
             <param name="a_selector" type="select" label="How should the annotation file be used?" help="(-a)">
                 <option value="boolean">Did a variant overlap a region or not? (boolean)</option>
                 <option value="count">How many regions did a variant overlap? (count)</option>
-                <option value="extract" selected="True">Extract specific values from a BED file. (extract)</option>
+                <option value="extract" selected="True">Extract specific values from a BED/VCF file. (extract)</option>
             </param>
             <when value="extract">
 
-                <param name="column_extracts" label="Column to extract information from for list annotations"
-                    type="data_column" data_ref="annotate_source" force_select="true" help="(-e)"/>
+                <param name="column_extracts" label="Column to extract information from for list annotations. For BED files, this is the column number. For VCF files, this is the name of the INFO field."
+                    type="text" force_select="true" help="(-e)"/>
 
 
                 <param name="column_type" type="select" label="What data type(s) should be used to represent the new values in the database?"