Fix to storage (SCHEMA CHANGE)