Part 21: Tweaks to sub-resources and actions