Merge in model changes to fctracker from htsworkflow branch