Updated setup and demo flows