Reworking adapter to remove duplication