Refactor to use marionette 0.9 apis