Added handling of call with continuation