Adding improved support for continue request