add infrastructure for parallel running