Proper clientId and clientSecret support for statistics