added -S, -C options for storage