LPS-47257 Rework module logic