CLASS-2.4: Additional Tasks [25 JUNE 2024]