Further work on resource model API