Reworking the adapter to simplify