[WIP] Started to phase-out the NameValueCollection at the storage level.