Added SampleStore (not finished, not tested)