Work in progress: added adapter.