Add improved srun support