Added: More comments in client