[TASK] Some additions for playing with the new resource management