Added default scope with archived user
Minor syntax changes