Improve module code
Rebuild packages