Towards updated adaptor