Added support for new uuid based client ids