diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
index 66f2a0e1..1e9e31c5 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
@@ -61,42 +61,49 @@ import { LangSelectorComponent } from './components/settings/lang-selector/lang-
 import { SubtitlesSettingComponent } from './components/settings/subtitles/subtitles.component';
 import { CaptionsComponent } from './components/captions/captions.component';
 
+const publicComponents = [
+	AdminDashboardComponent,
+	AdminLoginComponent,
+	VideoconferenceComponent,
+	ToolbarComponent,
+	PanelComponent,
+	ParticipantsPanelComponent,
+	ParticipantPanelItemComponent,
+	ChatPanelComponent,
+	StreamComponent,
+	LayoutComponent
+];
+const privateComponents = [
+	PreJoinComponent,
+	SessionComponent,
+	ActivitiesPanelComponent,
+	BackgroundEffectsPanelComponent,
+	SettingsPanelComponent,
+	AudioWaveComponent,
+	CaptionsComponent,
+	DialogTemplateComponent,
+	RecordingDialogComponent,
+	DeleteDialogComponent,
+	AvatarProfileComponent,
+	VideoComponent,
+	VideoDevicesComponent,
+	AudioDevicesComponent,
+	NicknameInputComponent,
+	LangSelectorComponent,
+	RecordingActivityComponent,
+	SubtitlesSettingComponent
+];
+
 @NgModule({
 	declarations: [
-		VideoComponent,
-		ToolbarComponent,
-		ChatPanelComponent,
-		SessionComponent,
-		LayoutComponent,
-		CaptionsComponent,
-		StreamComponent,
-		DialogTemplateComponent,
-		RecordingDialogComponent,
-		DeleteDialogComponent,
+		publicComponents,
+		privateComponents,
 		LinkifyPipe,
 		ParticipantStreamsPipe,
 		DurationFromSecondsPipe,
 		SearchByStringPropertyPipe,
 		StreamTypesEnabledPipe,
-		TranslatePipe,
-		ParticipantPanelItemComponent,
-		ParticipantsPanelComponent,
-		VideoconferenceComponent,
-		AudioWaveComponent,
-		PanelComponent,
-		AvatarProfileComponent,
-		PreJoinComponent,
-		VideoDevicesComponent,
-		AudioDevicesComponent,
-		NicknameInputComponent,
-		LangSelectorComponent,
-		SubtitlesSettingComponent,
-		BackgroundEffectsPanelComponent,
-		SettingsPanelComponent,
-		ActivitiesPanelComponent,
-		RecordingActivityComponent,
-		AdminDashboardComponent,
-		AdminLoginComponent
+		TranslatePipe
 	],
 	imports: [
 		CommonModule,
@@ -126,23 +133,7 @@ import { CaptionsComponent } from './components/captions/captions.component';
 		RecordingService
 	],
 	exports: [
-		VideoconferenceComponent,
-		ToolbarComponent,
-		PanelComponent,
-		ParticipantsPanelComponent,
-		ParticipantPanelItemComponent,
-		BackgroundEffectsPanelComponent,
-		SettingsPanelComponent,
-		ActivitiesPanelComponent,
-		ChatPanelComponent,
-		SessionComponent,
-		LayoutComponent,
-		StreamComponent,
-		VideoComponent,
-		AudioWaveComponent,
-		PreJoinComponent,
-		AdminDashboardComponent,
-		AdminLoginComponent,
+		publicComponents,
 		ParticipantStreamsPipe,
 		DurationFromSecondsPipe,
 		StreamTypesEnabledPipe,