Adding supervisor support and handlebars.