Adding manual task handling