Changes to the adapter