Added preliminary support for client ids