Updated users handling