Bugfix for ADM support
Upgrading lib to support ADM and default message properties