Simplify and improve the speed of modules