Aligned with the resource.api changes