Client: Add comments