Added StoreBaseline classes