Add type to snapshot-store and simplify cookie-set
Merge simplified snapshot-store and cookie-set to master