Added requeue support