Framework v1 1 1

Upgraded the underlying framework to Adapt 1.1.1 and fixed compatibility issues