Better module handling.