Redesign from class to defined type for application monitoring