Added classes for doctor mode support