Remove duplication from adapter classes