BHV-2262: Changing class