Adding some modules

based on the modules used by meltwater