Feature/associated saved items

Don't use `s` for this case.