Rewrite TaskManager, no more static methods