Add common adapter for reuse