Added continuation support