My stream refactored, JobGraphbuilder update