Added Support for Key-Value Database