Extend classes for OOD