[WIP] Adapter support