Switch to using snapshots for API return types