New Context and JobSet modifications