Improved modules. Fixes #3