Added start and stop infrastructures