And one more helper module
I seriously need a full scan to test this.