Updating so that this works out of the box with the cloud servers.