modified storage schema