--- a/bwa.xml	Tue Jul 21 13:51:02 2015 -0400
+++ b/bwa.xml	Tue Jul 21 14:12:49 2015 -0400
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tool id="bwa" name="Map with BWA" version="0.3.0">
+<tool id="bwa" name="Map with BWA" version="0.3.1">
   <description>- map short reads (&lt; 100 bp) against reference genome</description>
   <macros>
     <import>read_group_macros.xml</import>
@@ -70,9 +70,7 @@
     <requirement type="package" version="0.7.10.039ea20639">bwa</requirement>
     <requirement type="package" version="1.1">samtools</requirement>
   </requirements>
-  <stdio>
-    <exit_code range="1:" />
-  </stdio>
+  <expand macro="stdio" />
   <command>
     #set $reference_fasta_filename = "localref.fa"
 
@@ -371,7 +369,9 @@
   </inputs>
 
   <outputs>
-    <data format="bam" name="bam_output" label="${tool.name} on ${on_string} (mapped reads in BAM format)"/>
+    <data format="bam" name="bam_output" label="${tool.name} on ${on_string} (mapped reads in BAM format)">
+      <expand macro="dbKeyActionsBwa" />
+    </data>
   </outputs>
 
   <tests>