Task recorder refactoring crazyness