Guest user builder updates