[WIP] Adjustments for new resource management