Updated StoreManager design