Adapter changes in 2.02