Adapter changes