Implement proper resources handling for stop/start of a run