Data storage layer.
Added quoters for Key and Identifer.
Minor rename.