Experimental switch to TaskComponent