It would be helpful to provide test cases of this module. It will ensure that module functionality is working as expected.
Needs review
2.1
Code
Sharing patch file for test cases.