Added execution task handling