More refactoring. Use `me.task` internally