Polished new stateful modules interface