Implementing adaptors

From C-7KDB897