Issue #43 refactoring and integration with ADJTHandler.