Added getting clientId programatically