Reorganized adapter classes