Poc 7-compatible initial commit