added task factory, context etc.