fix filemap
fix storable