Add missing annotations for ClientId
Merge pull request #23 from vovkab/master

Add missing annotations for ClientId