Adapter classes changed