Updated to use uid/gid instead of usernames