- adapted to new module-boilerplate