Adding support for Json request/Response & Message Source