First commit
Some changes for PoC demo