updated storage schemas