Updated User system tools