Review comments

We should consider updating this module for adhl 3.0
I have created a ticket on this in the issue tracker.