Added check for key/value pair