Update to and comply with Marionette 2.2.1 methods