Added support for non-json data adapter