added Tools and ContentModules