Backbone adapter refactoring