Modification to the module, adding new functionalities
Commit chenges, added new functionalities.