[PLINK-348] - Refactoring and following EAP/WFLY guidelines.