Require storable by default
General refactor