Added improved Guest User functionality