Add some variables in preparation for eventual per-source weighting