Update code from https://github.com/dmi-try/marionette-collective