added missed classes for previous changes