added all the modules declaration
+ fixs