ENH: more tasks generalization