r7 - Added some modules