Added missed classes