rework module to be compatible with latest stubbles packages