updated facade and adapter