Better module support