Akshay/Pooja: Minor refactoring for detail absenteeism