Updated (but still under work) integrated D6 modules