--- a/defuse_results_to_vcf.xml	Mon Jan 04 15:55:00 2016 -0500
+++ b/defuse_results_to_vcf.xml	Wed Oct 18 16:55:57 2017 -0400
@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
 <tool id="defuse_results_to_vcf" name="Defuse Results to VCF" version="0.6.1">
   <description>generate a VCF from a DeFuse Results file</description>
-  <requirements>
-    <requirement type="package" version="0.6.1">defuse</requirement>
-  </requirements>
-  <command interpreter="python">defuse_results_to_vcf.py  --input $defuse_results --reference ${defuse_results.metadata.dbkey} --output $vcf
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <requirements>
+        <expand macro="defuse_requirement" />
+    </requirements>
+  <command><![CDATA[
+     python '$__tool_directory__/defuse_results_to_vcf.py  --input $defuse_results --reference ${defuse_results.metadata.dbkey} --output $vcf
+  ]]>
   </command>
   <inputs>
     <param name="defuse_results" type="data" format="defuse.results.tsv" label="Defuse Results file"/>