Adding support for Json/XML