Updated SO bean, added task wrapper and task wrapper generation