Update ExecutionContext so that we don't need to set everything through the constructor