Moved more storages to storage table
Tiny adjustment for Muhad