Standardizing ObjectStore samples

:+1: