Expanded Adapter functionality