Added more support for the old client.