Added support for any content type in client