Make storage options more strict