Added retrieval of client id