Updated Demo builder