PoC7 updates