Storage map count
refactor a bit
Storage hokyu