Made things a bit more module compatible.