Review comments

We should consider updating this module for adhl 3.0