Update to work with Backbone master