Add status handler and introduce execution context