Update to abstract adapter