Add serverHost and baseURIParam