Simplify storage options