Module version

- Module support
- some changes in the functions