Separation of functions to enable parallel runs