Improve thoroughness for users, groups, and files