Added in the ability to set a client ID