Updated Client and Scope comments