Towards #101: Compatibility layer

Tests fail on 2.11 with an AME, so I still need to do some debugging :)