Separated adapters from model #581