Module improvement.s