added case storage support