Changes to Adapter