Fix Storable use