Added ability to manually set client ID.