Add Storage Models

Add more models to enforce invariants at the storage layer. This will make the next cross device integrity checking PR a bit simpler.