Added getClientId function