Support new resource API