Client ID

client id generation enhancements