Tune the new Storable code