added modules - but have to fix upgrade changes
-------
- Init