Add missing annotations for ClientId