Changes made for POC demo