Switch to new resource framework.