Added additional modules.

Hi,

I've added additional modules. Can someone review the changes please? Thanks

   fintan