Update - Adding Modules and report function