Updated demo tool architecture