add support for key/value data