Better continuation support