Add ability to locate specific key/value