Updated clients to be able to work with raw json