Adding missed classes