Refactor Storable instances.