Task context handling extended