Some changes to Adapter classes