CYB-367 - Refactored the engagement index tool