Changes for different classes as per task