diff --git a/lib/Routes/api_v1_routes.php b/lib/Routes/api_v1_routes.php
index 792a357ee1..8d5e62096a 100644
--- a/lib/Routes/api_v1_routes.php
+++ b/lib/Routes/api_v1_routes.php
@@ -7,8 +7,8 @@
  */
 global $klein;
 
-route( '/api/v1/jobs/[:id_job]/[:password]/stats', 'GET',  'API\V1\StatsController', 'stats' );
+route( '/api/v1/jobs/[:id_job]/[:password]/stats', 'GET', [ 'API\V1\StatsController', 'stats' ] );
 
-$klein->with('/api/v1/projects/[:id_project]/[:password]', function() {
-    route( '/creation_status',      'GET',  'API\V2\ProjectCreationStatusController',   'get' );
-});
+$klein->with( '/api/v1/projects/[:id_project]/[:password]', function () {
+    route( '/creation_status', 'GET', [ 'API\V2\ProjectCreationStatusController', 'get' ] );
+} );
diff --git a/lib/Routes/api_v2_routes.php b/lib/Routes/api_v2_routes.php
index eb6257eb52..dcd3efc787 100644
--- a/lib/Routes/api_v2_routes.php
+++ b/lib/Routes/api_v2_routes.php
@@ -7,133 +7,133 @@
  */
 global $klein;
 
-$klein->with('/api/v2/projects/[:id_project]/[:password]', function() {
-    route( '',                      'GET',  'API\V2\ProjectsController',    'get'     ); //this do not show some info like teams and translators
-    route( '/urls',                 'GET',  'API\V2\UrlsController',        'urls'      );
-    route( '/jobs/[:id_job]/merge', 'POST', 'API\V2\JobMergeController',    'merge'     );
-    route( '/jobs/[:id_job]/[:job_password]/split/[:num_split]/check', 'POST', 'API\V2\JobSplitController', 'check' );
-    route( '/jobs/[:id_job]/[:job_password]/split/[:num_split]/apply', 'POST', 'API\V2\JobSplitController', 'apply' );
-    route( '/creation_status', 'GET', 'API\V2\ProjectCreationStatusController', 'get' );
-    route( '/completion_status', 'GET', 'API\V2\ProjectCompletionStatus', 'status' );
-    route( '/due_date', 'PUT', 'API\V2\ProjectsController', 'updateDueDate' );
-    route( '/due_date', 'POST', 'API\V2\ProjectsController', 'setDueDate' );
-    route( '/due_date', 'DELETE', 'API\V2\ProjectsController', 'deleteDueDate' );
-    route( '/cancel', 'POST', 'API\V2\ProjectsController', 'cancel' );
-    route( '/archive', 'POST', 'API\V2\ProjectsController', 'archive' );
-    route( '/active', 'POST', 'API\V2\ProjectsController', 'active' );
-    route( '/r2', 'POST', 'API\V2\ReviewsController', 'createReview' );
-    route( '/analysis/status', 'GET', '\API\V3\StatusController', 'index' );
-});
+$klein->with( '/api/v2/projects/[:id_project]/[:password]', function () {
+    route( '', 'GET', [ 'API\V2\ProjectsController', 'get' ] ); //this do not show some info like teams and translators
+    route( '/urls', 'GET', [ 'API\V2\UrlsController', 'urls' ] );
+    route( '/jobs/[:id_job]/merge', 'POST', [ 'API\V2\JobMergeController', 'merge' ] );
+    route( '/jobs/[:id_job]/[:job_password]/split/[:num_split]/check', 'POST', [ 'API\V2\JobSplitController', 'check' ] );
+    route( '/jobs/[:id_job]/[:job_password]/split/[:num_split]/apply', 'POST', [ 'API\V2\JobSplitController', 'apply' ] );
+    route( '/creation_status', 'GET', [ 'API\V2\ProjectCreationStatusController', 'get' ] );
+    route( '/completion_status', 'GET', [ 'API\V2\ProjectCompletionStatus', 'status' ] );
+    route( '/due_date', 'PUT', [ 'API\V2\ProjectsController', 'updateDueDate' ] );
+    route( '/due_date', 'POST', [ 'API\V2\ProjectsController', 'setDueDate' ] );
+    route( '/due_date', 'DELETE', [ 'API\V2\ProjectsController', 'deleteDueDate' ] );
+    route( '/cancel', 'POST', [ 'API\V2\ProjectsController', 'cancel' ] );
+    route( '/archive', 'POST', [ 'API\V2\ProjectsController', 'archive' ] );
+    route( '/active', 'POST', [ 'API\V2\ProjectsController', 'active' ] );
+    route( '/r2', 'POST', [ 'API\V2\ReviewsController', 'createReview' ] );
+    route( '/analysis/status', 'GET', [ '\API\V3\StatusController', 'index' ] );
+} );
 
-route( '/api/v2/project-completion-status/[i:id_project]', 'GET', '\API\V2\ProjectCompletionStatus', 'status' );
+route( '/api/v2/project-completion-status/[i:id_project]', 'GET', [ '\API\V2\ProjectCompletionStatus', 'status' ] );
 
 
-$klein->with('/api/v2/activity', function() {
+$klein->with( '/api/v2/activity', function () {
 
-    route( '/project/[:id_project]/[:password]/last', 'GET', '\API\V2\ActivityLogController', 'lastOnProject' );
-    route( '/job/[:id_job]/[:password]/last', 'GET', 'API\V2\ActivityLogController', 'lastOnJob' );
+    route( '/project/[:id_project]/[:password]/last', 'GET', [ '\API\V2\ActivityLogController', 'lastOnProject' ] );
+    route( '/job/[:id_job]/[:password]/last', 'GET', [ 'API\V2\ActivityLogController', 'lastOnJob' ] );
 
-});
+} );
 
-$klein->with('/api/v2/jobs/[:id_job]/[:password]', function() {
+$klein->with( '/api/v2/jobs/[:id_job]/[:password]', function () {
 
-    route( '',              'GET', 'API\V2\ChunkController', 'show' );
-    route( '/comments',     'GET', 'API\V2\CommentsController', 'index' );
+    route( '', 'GET', [ 'API\V2\ChunkController', 'show' ] );
+    route( '/comments', 'GET', [ 'API\V2\CommentsController', 'index' ] );
 
-    route( '/quality-report', 'GET', 'Features\ReviewExtended\Controller\API\QualityReportController', 'show' );
-    route( '/quality-report/general', 'GET', 'Features\ReviewExtended\Controller\API\QualityReportController', 'general' );
+    route( '/quality-report', 'GET', [ 'Features\ReviewExtended\Controller\API\QualityReportController', 'show' ] );
+    route( '/quality-report/general', 'GET', [ 'Features\ReviewExtended\Controller\API\QualityReportController', 'general' ] );
 
-    route( '/translator', 'GET',  '\API\V2\JobsTranslatorsController', 'get' ) ;
-    route( '/translator', 'POST',  '\API\V2\JobsTranslatorsController', 'add' ) ;
+    route( '/translator', 'GET', [ '\API\V2\JobsTranslatorsController', 'get' ] );
+    route( '/translator', 'POST', [ '\API\V2\JobsTranslatorsController', 'add' ] );
 
-    route( '/translation-issues', 'GET', 'API\V2\ChunkTranslationIssueController', 'index' );
-    route( '/translation-versions', 'GET', '\API\V2\ChunkTranslationVersionController', 'index' );
+    route( '/translation-issues', 'GET', [ 'API\V2\ChunkTranslationIssueController', 'index' ] );
+    route( '/translation-versions', 'GET', [ '\API\V2\ChunkTranslationVersionController', 'index' ] );
 
-    route( '/revise/segments/[:id_segment]/translation-versions', 'GET', '\API\V2\ReviseTranslationIssuesController', 'index' );
+    route( '/revise/segments/[:id_segment]/translation-versions', 'GET', [ '\API\V2\ReviseTranslationIssuesController', 'index' ] );
 
-    route( '/segments/[:id_segment]/translation-versions', 'GET', '\API\V2\SegmentVersion', 'index' );
-    route( '/segments/[:id_segment]/translation-versions/[:version_number]', 'GET', '\API\V2\SegmentVersion', 'detail' );
+    route( '/segments/[:id_segment]/translation-versions', 'GET', [ '\API\V2\SegmentVersion', 'index' ] );
+    route( '/segments/[:id_segment]/translation-versions/[:version_number]', 'GET', [ '\API\V2\SegmentVersion', 'detail' ] );
 
-    route( '/segments/[:id_segment]/translation-issues', 'POST', 'API\V2\SegmentTranslationIssueController', 'create' );
-    route( '/segments/[:id_segment]/translation-issues/[:id_issue]', 'DELETE', 'API\V2\SegmentTranslationIssueController', 'delete' );
-    route( '/segments/[:id_segment]/translation-issues/[:id_issue]', 'POST', 'API\V2\SegmentTranslationIssueController', 'update' );
-    route( '/segments/[:id_segment]/translation-issues/[:id_issue]/comments', 'POST', 'API\V2\SegmentTranslationIssueController', 'createComment' );
-    route( '/segments/[:id_segment]/translation-issues/[:id_issue]/comments', 'GET', 'API\V2\SegmentTranslationIssueController', 'getComments' );
+    route( '/segments/[:id_segment]/translation-issues', 'POST', [ 'API\V2\SegmentTranslationIssueController', 'create' ] );
+    route( '/segments/[:id_segment]/translation-issues/[:id_issue]', 'DELETE', [ 'API\V2\SegmentTranslationIssueController', 'delete' ] );
+    route( '/segments/[:id_segment]/translation-issues/[:id_issue]', 'POST', [ 'API\V2\SegmentTranslationIssueController', 'update' ] );
+    route( '/segments/[:id_segment]/translation-issues/[:id_issue]/comments', 'POST', [ 'API\V2\SegmentTranslationIssueController', 'createComment' ] );
+    route( '/segments/[:id_segment]/translation-issues/[:id_issue]/comments', 'GET', [ 'API\V2\SegmentTranslationIssueController', 'getComments' ] );
 
-    route( '/segments/status', 'POST', '\API\V2\JobStatusController', 'changeSegmentsStatus' ); // mark as translated bulk
+    route( '/segments/status', 'POST', [ '\API\V2\JobStatusController', 'changeSegmentsStatus' ] ); // mark as translated bulk
 
-    route( '/segments-filter', 'GET', 'Features\SegmentFilter\Controller\API\FilterController', 'index' );
+    route( '/segments-filter', 'GET', [ 'Features\SegmentFilter\Controller\API\FilterController', 'index' ] );
 
-    route( '/options', 'POST', 'API\V2\ChunkOptionsController', 'update' );
+    route( '/options', 'POST', [ 'API\V2\ChunkOptionsController', 'update' ] );
 
 
-    route( '/delete', 'POST', 'API\V2\ChunkController', 'delete' );
-    route( '/cancel', 'POST', 'API\V2\ChunkController', 'cancel' );
-    route( '/archive', 'POST', 'API\V2\ChunkController', 'archive' );
-    route( '/active', 'POST', 'API\V2\ChunkController', 'active' );
+    route( '/delete', 'POST', [ 'API\V2\ChunkController', 'delete' ] );
+    route( '/cancel', 'POST', [ 'API\V2\ChunkController', 'cancel' ] );
+    route( '/archive', 'POST', [ 'API\V2\ChunkController', 'archive' ] );
+    route( '/active', 'POST', [ 'API\V2\ChunkController', 'active' ] );
 
-});
+} );
 
-$klein->with('/api/v2/glossaries', function() {
+$klein->with( '/api/v2/glossaries', function () {
 
-    route( '/check/', 'POST', '\API\V2\GlossariesController', 'check' );
-    route( '/import/', 'POST', '\API\V2\GlossariesController', 'import' );
-    route( '/import/status/[:uuid]', 'GET', '\API\V2\GlossariesController', 'uploadStatus' );
-    route( '/export/', 'POST', '\API\V2\GlossariesController', 'download' );
+    route( '/check/', 'POST', [ '\API\V2\GlossariesController', 'check' ] );
+    route( '/import/', 'POST', [ '\API\V2\GlossariesController', 'import' ] );
+    route( '/import/status/[:uuid]', 'GET', [ '\API\V2\GlossariesController', 'uploadStatus' ] );
+    route( '/export/', 'POST', [ '\API\V2\GlossariesController', 'download' ] );
 
-});
+} );
 
-route( '/api/v2/ping', 'HEAD', '\API\V2\KeyCheckController', 'ping' );
+route( '/api/v2/ping', 'HEAD', [ '\API\V2\KeyCheckController', 'ping' ] );
 
-route( '/api/v2/user/[:user_api_key]', 'GET',  '\API\V2\KeyCheckController',   'getUID' );
-route( '/api/v2/keys/list',            'GET',  '\API\V2\MemoryKeysController', 'listKeys' );
-route( '/api/v2/engines/list',         'GET',  '\API\V2\EnginesController',    'listEngines' );
+route( '/api/v2/user/[:user_api_key]', 'GET', [ '\API\V2\KeyCheckController', 'getUID' ] );
+route( '/api/v2/keys/list', 'GET', [ '\API\V2\MemoryKeysController', 'listKeys' ] );
+route( '/api/v2/engines/list', 'GET', [ '\API\V2\EnginesController', 'listEngines' ] );
 
-$klein->with('/api/v2/teams', function() {
+$klein->with( '/api/v2/teams', function () {
 
-    route( '',                                     'GET',  '\API\V2\TeamsController', 'getTeamList') ;
-    route( '',                                     'POST', '\API\V2\TeamsController', 'create') ;
-    route( '/[i:id_team]',                         'PUT',  '\API\V2\TeamsController', 'update' ) ;
+    route( '', 'GET', [ '\API\V2\TeamsController', 'getTeamList' ] );
+    route( '', 'POST', [ '\API\V2\TeamsController', 'create' ] );
+    route( '/[i:id_team]', 'PUT', [ '\API\V2\TeamsController', 'update' ] );
 
-    route( '/[i:id_team]/members',                 'POST',    '\API\V2\TeamMembersController', 'update') ;
-    route( '/[i:id_team]/members',                 'GET',     '\API\V2\TeamMembersController', 'index' ) ;
-    route( '/[i:id_team]/members/[i:uid_member]',  'DELETE' , '\API\V2\TeamMembersController', 'delete' );
+    route( '/[i:id_team]/members', 'POST', [ '\API\V2\TeamMembersController', 'update' ] );
+    route( '/[i:id_team]/members', 'GET', [ '\API\V2\TeamMembersController', 'index' ] );
+    route( '/[i:id_team]/members/[i:uid_member]', 'DELETE', [ '\API\V2\TeamMembersController', 'delete' ] );
 
-    route( '/[i:id_team]/projects/[i:id_project]', 'PUT', 'API\V2\TeamsProjectsController',  'update' ) ;
-    route( '/[i:id_team]/projects/[i:id_project]', 'GET', 'API\V2\TeamsProjectsController',  'get' ) ;
-    route( '/[i:id_team]/projects/[:project_name]', 'GET', 'API\V2\TeamsProjectsController',  'getByName' ) ;
-    route( '/[i:id_team]/projects',                'GET', '\API\V2\TeamsProjectsController', 'getAll') ;
+    route( '/[i:id_team]/projects/[i:id_project]', 'PUT', [ 'API\V2\TeamsProjectsController', 'update' ] );
+    route( '/[i:id_team]/projects/[i:id_project]', 'GET', [ 'API\V2\TeamsProjectsController', 'get' ] );
+    route( '/[i:id_team]/projects/[:project_name]', 'GET', [ 'API\V2\TeamsProjectsController', 'getByName' ] );
+    route( '/[i:id_team]/projects', 'GET', [ '\API\V2\TeamsProjectsController', 'getAll' ] );
 
-}) ;
+} );
 
-$klein->with('/api/v2/languages', function() {
-    route( '', 'GET', '\API\V2\SupportedLanguagesController', 'index' );
-});
+$klein->with( '/api/v2/languages', function () {
+    route( '', 'GET', [ '\API\V2\SupportedLanguagesController', 'index' ] );
+} );
 
 
-$klein->with('/api/v2/files', function() {
-    route( '', 'GET', '\API\V2\SupportedFilesController', 'index' );
-});
+$klein->with( '/api/v2/files', function () {
+    route( '', 'GET', [ '\API\V2\SupportedFilesController', 'index' ] );
+} );
 
 $klein->with( '/api/v2/payable_rate', function () {
-    route('/schema', 'GET', '\API\V3\PayableRateController', 'schema');
-    route('/validate', 'POST', '\API\V3\PayableRateController', 'validate');
-    route('', 'GET', '\API\V3\PayableRateController', 'index');
-    route('', 'POST', '\API\V3\PayableRateController', 'create');
-    route('/[:id]', 'GET', '\API\V3\PayableRateController', 'view');
-    route('/[:id]', 'DELETE', '\API\V3\PayableRateController', 'delete');
-    route('/[:id]', 'PUT', '\API\V3\PayableRateController', 'edit');
+    route( '/schema', 'GET', [ '\API\V3\PayableRateController', 'schema' ] );
+    route( '/validate', 'POST', [ '\API\V3\PayableRateController', 'validate' ] );
+    route( '', 'GET', [ '\API\V3\PayableRateController', 'index' ] );
+    route( '', 'POST', [ '\API\V3\PayableRateController', 'create' ] );
+    route( '/[:id]', 'GET', [ '\API\V3\PayableRateController', 'view' ] );
+    route( '/[:id]', 'DELETE', [ '\API\V3\PayableRateController', 'delete' ] );
+    route( '/[:id]', 'PUT', [ '\API\V3\PayableRateController', 'edit' ] );
 
-});
+} );
 
 // change password
-route( '/api/v2/change-password',  'POST', 'API\V2\ChangePasswordController', 'changePassword' );
+route( '/api/v2/change-password', 'POST', [ 'API\V2\ChangePasswordController', 'changePassword' ] );
 
 // Download files
-route( '/api/v2/original/[:id_job]/[:password]', 'GET',  'API\V2\DownloadOriginalController', 'index' );
-route( '/api/v2/translation/[:id_job]/[:password]', 'GET',  'API\V2\DownloadFileController', 'index' );
-route( '/api/v2/SDLXLIFF/[:id_job]/[:password]/[:filename]', 'GET',  'API\V2\DownloadFileController', 'forceXliff' );
-route( '/api/v2/TMX/[:id_job]/[:password]', 'GET',  'API\V2\ExportTMXController', 'index' );
+route( '/api/v2/original/[:id_job]/[:password]', 'GET', [ 'API\V2\DownloadOriginalController', 'index' ] );
+route( '/api/v2/translation/[:id_job]/[:password]', 'GET', [ 'API\V2\DownloadFileController', 'index' ] );
+route( '/api/v2/SDLXLIFF/[:id_job]/[:password]/[:filename]', 'GET', [ 'API\V2\DownloadFileController', 'forceXliff' ] );
+route( '/api/v2/TMX/[:id_job]/[:password]', 'GET', [ 'API\V2\ExportTMXController', 'index' ] );
 
 // User
-route('/api/v2/user', 'PUT',  'API\V2\UserController', 'edit');
\ No newline at end of file
+route( '/api/v2/user', 'PUT', [ 'API\V2\UserController', 'edit' ] );
\ No newline at end of file
diff --git a/lib/Routes/api_v3_routes.php b/lib/Routes/api_v3_routes.php
index b1d5a0919e..8a6ae89889 100644
--- a/lib/Routes/api_v3_routes.php
+++ b/lib/Routes/api_v3_routes.php
@@ -8,121 +8,121 @@
 global $klein;
 
 $klein->with( '/api/v3/projects', function () {
-    route( '/analysis/status/[i:id_project]/[:password]', 'GET', '\API\V3\StatusController', 'index' );
+    route( '/analysis/status/[i:id_project]/[:password]', 'GET', [ '\API\V3\StatusController', 'index' ] );
 } );
 
 $klein->with('/api/v3/projects/[i:id_project]/[:password]', function() {
-    route( '/cancel', 'POST', 'API\V3\ChangeProjectStatusController', 'cancel' );
-    route( '/delete', 'POST', 'API\V3\ChangeProjectStatusController', 'delete' );
-    route( '/archive', 'POST', 'API\V3\ChangeProjectStatusController', 'archive' );
-    route( '/active', 'POST', 'API\V3\ChangeProjectStatusController', 'active' );
+    route( '/cancel', 'POST', [ 'API\V3\ChangeProjectStatusController', 'cancel' ] );
+    route( '/delete', 'POST', [ 'API\V3\ChangeProjectStatusController', 'delete' ] );
+    route( '/archive', 'POST', [ 'API\V3\ChangeProjectStatusController', 'archive' ] );
+    route( '/active', 'POST', [ 'API\V3\ChangeProjectStatusController', 'active' ] );
 });
 
 $klein->with( '/api/v3/jobs/[i:id_job]/[:password]', function () {
-    route( '', 'GET', '\API\V3\ChunkController', 'show' ); //this does not show some info like teams and translators
-    route( '/quality-report/segments', 'GET', 'Features\ReviewExtended\Controller\API\QualityReportController', 'segments' );
-    route( '/files', 'GET', '\API\V3\FileInfoController', 'getInfo' );
-    route( '/file/[i:id_file]/instructions', 'GET', '\API\V3\FileInfoController', 'getInstructions' );
-    route( '/file/[i:id_file]/[:id_file_parts]/instructions', 'GET', '\API\V3\FileInfoController', 'getInstructionsByFilePartsId' );
-    route( '/file/[i:id_file]/instructions', 'POST', '\API\V3\FileInfoController', 'setInstructions' );
-    route( '/metadata', 'GET', '\API\V3\MetaDataController', 'index' );
-
-    route( '/delete', 'POST', 'API\V3\ChangeJobStatusController', 'delete' );
-    route( '/cancel', 'POST', 'API\V3\ChangeJobStatusController', 'cancel' );
-    route( '/archive', 'POST', 'API\V3\ChangeJobStatusController', 'archive' );
-    route( '/active', 'POST', 'API\V3\ChangeJobStatusController', 'active' );
+    route( '', 'GET', [ '\API\V3\ChunkController', 'show' ] ); //this does not show some info like teams and translators
+    route( '/quality-report/segments', 'GET', [ 'Features\ReviewExtended\Controller\API\QualityReportController', 'segments' ] );
+    route( '/files', 'GET', [ '\API\V3\FileInfoController', 'getInfo' ] );
+    route( '/file/[i:id_file]/instructions', 'GET', [ '\API\V3\FileInfoController', 'getInstructions' ] );
+    route( '/file/[i:id_file]/[:id_file_parts]/instructions', 'GET', [ '\API\V3\FileInfoController', 'getInstructionsByFilePartsId' ] );
+    route( '/file/[i:id_file]/instructions', 'POST', [ '\API\V3\FileInfoController', 'setInstructions' ] );
+    route( '/metadata', 'GET', [ '\API\V3\MetaDataController', 'index' ] );
+
+    route( '/delete', 'POST', [ 'API\V3\ChangeJobStatusController', 'delete' ] );
+    route( '/cancel', 'POST', [ 'API\V3\ChangeJobStatusController', 'cancel' ] );
+    route( '/archive', 'POST', [ 'API\V3\ChangeJobStatusController', 'archive' ] );
+    route( '/active', 'POST', [ 'API\V3\ChangeJobStatusController', 'active' ] );
 } );
 
 $klein->with( '/api/v3/teams', function () {
-    route( '/[i:id_team]/projects', 'GET', '\API\V3\TeamsProjectsController', 'getPaginated' );
+    route( '/[i:id_team]/projects', 'GET', [ '\API\V3\TeamsProjectsController', 'getPaginated' ] );
 } );
 
-route( '/api/v3/word-count/raw', 'POST', '\API\V3\CountWordController', 'rawWords' );
-route( '/api/v3/jobs/[i:id_job]/[:password]/[:source_page]/issue-report/segments', 'GET', '\API\V3\IssueCheckController', 'segments' );
-route( '/api/v3/feedback', 'POST', '\API\V3\RevisionFeedbackController', 'feedback' );
-route( '/api/v3/qr/download', 'POST', '\API\V3\DownloadQRController', 'download' );
+route( '/api/v3/word-count/raw', 'POST', [ '\API\V3\CountWordController', 'rawWords' ] );
+route( '/api/v3/jobs/[i:id_job]/[:password]/[:source_page]/issue-report/segments', 'GET', [ '\API\V3\IssueCheckController', 'segments' ] );
+route( '/api/v3/feedback', 'POST', [ '\API\V3\RevisionFeedbackController', 'feedback' ] );
+route( '/api/v3/qr/download', 'POST', [ '\API\V3\DownloadQRController', 'download' ] );
 
 $klein->with( '/api/v3/glossary', function () {
-    route( '/blacklist/upload', 'POST', '\API\V3\BlacklistController', 'upload' );
-    route( '/blacklist/delete/[i:id_file]', 'DELETE', '\API\V3\BlacklistController', 'delete' );
-    route( '/blacklist/get/[i:id_file]', 'GET', '\API\V3\BlacklistController', 'get' );
+    route( '/blacklist/upload', 'POST', [ '\API\V3\BlacklistController', 'upload' ] );
+    route( '/blacklist/delete/[i:id_file]', 'DELETE', [ '\API\V3\BlacklistController', 'delete' ] );
+    route( '/blacklist/get/[i:id_file]', 'GET', [ '\API\V3\BlacklistController', 'get' ] );
 } );
 
 $klein->with( '/api/v3/qa_model_template', function () {
-    route( '/schema', 'GET', '\API\V3\QAModelTemplateController', 'schema' );
-    route( '/validate', 'POST', '\API\V3\QAModelTemplateController', 'validate' );
-    route( '', 'GET', '\API\V3\QAModelTemplateController', 'index' );
-    route( '', 'POST', '\API\V3\QAModelTemplateController', 'create' );
-    route( '/[i:id]', 'GET', '\API\V3\QAModelTemplateController', 'view' );
-    route( '/[i:id]', 'DELETE', '\API\V3\QAModelTemplateController', 'delete' );
-    route( '/[i:id]', 'PUT', '\API\V3\QAModelTemplateController', 'edit' );
+    route( '/schema', 'GET', [ '\API\V3\QAModelTemplateController', 'schema' ] );
+    route( '/validate', 'POST', [ '\API\V3\QAModelTemplateController', 'validate' ] );
+    route( '', 'GET', [ '\API\V3\QAModelTemplateController', 'index' ] );
+    route( '', 'POST', [ '\API\V3\QAModelTemplateController', 'create' ] );
+    route( '/[i:id]', 'GET', [ '\API\V3\QAModelTemplateController', 'view' ] );
+    route( '/[i:id]', 'DELETE', [ '\API\V3\QAModelTemplateController', 'delete' ] );
+    route( '/[i:id]', 'PUT', [ '\API\V3\QAModelTemplateController', 'edit' ] );
 } );
 
 $klein->with( '/api/v3/payable_rate', function () {
-    route( '/schema', 'GET', '\API\V3\PayableRateController', 'schema' );
-    route( '/validate', 'POST', '\API\V3\PayableRateController', 'validate' );
-    route( '', 'GET', '\API\V3\PayableRateController', 'index' );
-    route( '', 'POST', '\API\V3\PayableRateController', 'create' );
-    route( '/[i:id]', 'GET', '\API\V3\PayableRateController', 'view' );
-    route( '/[i:id]', 'DELETE', '\API\V3\PayableRateController', 'delete' );
-    route( '/[i:id]', 'PUT', '\API\V3\PayableRateController', 'edit' );
+    route( '/schema', 'GET', [ '\API\V3\PayableRateController', 'schema' ] );
+    route( '/validate', 'POST', [ '\API\V3\PayableRateController', 'validate' ] );
+    route( '', 'GET', [ '\API\V3\PayableRateController', 'index' ] );
+    route( '', 'POST', [ '\API\V3\PayableRateController', 'create' ] );
+    route( '/[i:id]', 'GET', [ '\API\V3\PayableRateController', 'view' ] );
+    route( '/[i:id]', 'DELETE', [ '\API\V3\PayableRateController', 'delete' ] );
+    route( '/[i:id]', 'PUT', [ '\API\V3\PayableRateController', 'edit' ] );
 } );
 
 // TM Keys
 $klein->with( '/api/v3/tm-keys', function () {
-    route( '/list', 'GET', '\API\V3\TmKeyManagementController', 'getByUser' );
+    route( '/list', 'GET', [ '\API\V3\TmKeyManagementController', 'getByUser' ] );
 } );
 
-route( '/api/v3/projects/[i:id_project]/[:password]/segment-analysis',  'GET',  'API\V3\SegmentAnalysisController', 'project' );
-route( '/api/v3/jobs/[i:id_job]/[:password]/segment-analysis',          'GET',  'API\V3\SegmentAnalysisController', 'job' );
-route( '/api/v3/create-key',  'POST', 'API\V3\MyMemoryController', 'create' );
+route( '/api/v3/projects/[i:id_project]/[:password]/segment-analysis',  'GET',  [ 'API\V3\SegmentAnalysisController', 'project' ] );
+route( '/api/v3/jobs/[i:id_job]/[:password]/segment-analysis',          'GET',  [ 'API\V3\SegmentAnalysisController', 'job' ] );
+route( '/api/v3/create-key',  'POST', [ 'API\V3\MyMemoryController', 'create' ] );
 
 // MMT
 $klein->with( '/api/v3/mmt/[i:engineId]', function () {
-    route( '/keys', 'GET', '\API\V3\ModernMTController', 'keys' );
-    route( '/job-status/[:uuid]', 'GET', '\API\V3\ModernMTController', 'jobStatus' );
-    route( '/create-memory-and-import-glossary', 'POST', '\API\V3\ModernMTController', 'createMemoryAndImportGlossary' );
-    route( '/import-glossary', 'POST', '\API\V3\ModernMTController', 'importGlossary' );
-    route( '/modify-glossary', 'POST', '\API\V3\ModernMTController', 'modifyGlossary' );
-    route( '/create-memory', 'POST', '\API\V3\ModernMTController', 'createMemory' );
-    route( '/update-memory/[:memoryId]', 'POST', '\API\V3\ModernMTController', 'updateMemory' );
-    route( '/delete-memory/[:memoryId]', 'GET', '\API\V3\ModernMTController', 'deleteMemory' );
+    route( '/keys', 'GET', [ '\API\V3\ModernMTController', 'keys' ] );
+    route( '/job-status/[:uuid]', 'GET', [ '\API\V3\ModernMTController', 'jobStatus' ] );
+    route( '/create-memory-and-import-glossary', 'POST', [ '\API\V3\ModernMTController', 'createMemoryAndImportGlossary' ] );
+    route( '/import-glossary', 'POST', [ '\API\V3\ModernMTController', 'importGlossary' ] );
+    route( '/modify-glossary', 'POST', [ '\API\V3\ModernMTController', 'modifyGlossary' ] );
+    route( '/create-memory', 'POST', [ '\API\V3\ModernMTController', 'createMemory' ] );
+    route( '/update-memory/[:memoryId]', 'POST', [ '\API\V3\ModernMTController', 'updateMemory' ] );
+    route( '/delete-memory/[:memoryId]', 'GET', [ '\API\V3\ModernMTController', 'deleteMemory' ] );
 } );
 
 // DEEPL
 $klein->with( '/api/v3/deepl/[:engineId]', function () {
-    route( '/glossaries', 'GET', '\API\V3\DeepLGlossaryController', 'all' );
-    route( '/glossaries', 'POST', '\API\V3\DeepLGlossaryController', 'create' );
-    route( '/glossaries/[i:id]', 'DELETE', '\API\V3\DeepLGlossaryController', 'delete' );
-    route( '/glossaries/[i:id]', 'GET', '\API\V3\DeepLGlossaryController', 'get' );
-    route( '/glossaries/[i:id]/entries', 'GET', '\API\V3\DeepLGlossaryController', 'getEntries' );
+    route( '/glossaries', 'GET', [ '\API\V3\DeepLGlossaryController', 'all' ] );
+    route( '/glossaries', 'POST', [ '\API\V3\DeepLGlossaryController', 'create' ] );
+    route( '/glossaries/[i:id]', 'DELETE', [ '\API\V3\DeepLGlossaryController', 'delete' ] );
+    route( '/glossaries/[i:id]', 'GET', [ '\API\V3\DeepLGlossaryController', 'get' ] );
+    route( '/glossaries/[i:id]/entries', 'GET', [ '\API\V3\DeepLGlossaryController', 'getEntries' ] );
 } );
 
 // PROJECT TEMPLATE
 $klein->with( '/api/v3/project-template', function () {
-    route( '/schema', 'GET', '\API\V3\ProjectTemplateController', 'schema' );
-    route( '/', 'GET', '\API\V3\ProjectTemplateController', 'all' );
-    route( '/', 'POST', '\API\V3\ProjectTemplateController', 'create' );
-    route( '/[i:id]', 'DELETE', '\API\V3\ProjectTemplateController', 'delete' );
-    route( '/[i:id]', 'PUT', '\API\V3\ProjectTemplateController', 'update' );
-    route( '/[i:id]', 'GET', '\API\V3\ProjectTemplateController', 'get' );
+    route( '/schema', 'GET', [ '\API\V3\ProjectTemplateController', 'schema' ] );
+    route( '/', 'GET', [ '\API\V3\ProjectTemplateController', 'all' ] );
+    route( '/', 'POST', [ '\API\V3\ProjectTemplateController', 'create' ] );
+    route( '/[i:id]', 'DELETE', [ '\API\V3\ProjectTemplateController', 'delete' ] );
+    route( '/[i:id]', 'PUT', [ '\API\V3\ProjectTemplateController', 'update' ] );
+    route( '/[i:id]', 'GET', [ '\API\V3\ProjectTemplateController', 'get' ] );
 } );
 
 // FILTERS AND XLIFF CONFIG
 $klein->with( '/api/v3/xliff-config-template', function () {
-    route( '/schema', 'GET', '\API\V3\XliffConfigTemplateController', 'schema' );
-    route( '/', 'GET', '\API\V3\XliffConfigTemplateController', 'all' );
-    route( '/', 'POST', '\API\V3\XliffConfigTemplateController', 'create' );
-    route( '/[i:id]', 'DELETE', '\API\V3\XliffConfigTemplateController', 'delete' );
-    route( '/[i:id]', 'PUT', '\API\V3\XliffConfigTemplateController', 'update' );
-    route( '/[i:id]', 'GET', '\API\V3\XliffConfigTemplateController', 'get' );
+    route( '/schema', 'GET', [ '\API\V3\XliffConfigTemplateController', 'schema' ] );
+    route( '/', 'GET', [ '\API\V3\XliffConfigTemplateController', 'all' ] );
+    route( '/', 'POST', [ '\API\V3\XliffConfigTemplateController', 'create' ] );
+    route( '/[i:id]', 'DELETE', [ '\API\V3\XliffConfigTemplateController', 'delete' ] );
+    route( '/[i:id]', 'PUT', [ '\API\V3\XliffConfigTemplateController', 'update' ] );
+    route( '/[i:id]', 'GET', [ '\API\V3\XliffConfigTemplateController', 'get' ] );
 } );
 
 $klein->with( '/api/v3/filters-config-template', function () {
-    route( '/schema', 'GET', '\API\V3\FiltersConfigTemplateController', 'schema' );
-    route( '/', 'GET', '\API\V3\FiltersConfigTemplateController', 'all' );
-    route( '/', 'POST', '\API\V3\FiltersConfigTemplateController', 'create' );
-    route( '/[i:id]', 'DELETE', '\API\V3\FiltersConfigTemplateController', 'delete' );
-    route( '/[i:id]', 'PUT', '\API\V3\FiltersConfigTemplateController', 'update' );
-    route( '/[i:id]', 'GET', '\API\V3\FiltersConfigTemplateController', 'get' );
+    route( '/schema', 'GET', [ '\API\V3\FiltersConfigTemplateController', 'schema' ] );
+    route( '/', 'GET', [ '\API\V3\FiltersConfigTemplateController', 'all' ] );
+    route( '/', 'POST', [ '\API\V3\FiltersConfigTemplateController', 'create' ] );
+    route( '/[i:id]', 'DELETE', [ '\API\V3\FiltersConfigTemplateController', 'delete' ] );
+    route( '/[i:id]', 'PUT', [ '\API\V3\FiltersConfigTemplateController', 'update' ] );
+    route( '/[i:id]', 'GET', [ '\API\V3\FiltersConfigTemplateController', 'get' ] );
 } );
\ No newline at end of file
diff --git a/lib/Routes/gdrive_routes.php b/lib/Routes/gdrive_routes.php
index 932e67d540..a0a75ede52 100644
--- a/lib/Routes/gdrive_routes.php
+++ b/lib/Routes/gdrive_routes.php
@@ -7,23 +7,23 @@
  */
 
 route(
-    '/webhooks/gdrive/open', 'GET',
-    'ConnectedServices\GDrive\GDriveController', 'open'
+        '/webhooks/gdrive/open', 'GET',
+        [ 'ConnectedServices\GDrive\GDriveController', 'open' ]
 );
 
-route('/gdrive/oauth/response', 'GET',
-    'ConnectedServices\GDrive\OAuthController', 'response'
+route( '/gdrive/oauth/response', 'GET',
+        [ 'ConnectedServices\GDrive\OAuthController', 'response' ]
 );
 
 route(
-    '/gdrive/list', 'GET',
-    'ConnectedServices\GDrive\GDriveController', 'listImportedFiles'
+        '/gdrive/list', 'GET',
+        [ 'ConnectedServices\GDrive\GDriveController', 'listImportedFiles' ]
 );
 route(
-    '/gdrive/change/[:sourceLanguage]', 'GET',
-    'ConnectedServices\GDrive\GDriveController', 'changeSourceLanguage'
+        '/gdrive/change/[:sourceLanguage]', 'GET',
+        [ 'ConnectedServices\GDrive\GDriveController', 'changeSourceLanguage' ]
 );
 route(
-    '/gdrive/delete/[:fileId]', 'GET',
-    'ConnectedServices\GDrive\GDriveController', 'deleteImportedFile'
+        '/gdrive/delete/[:fileId]', 'GET',
+        [ 'ConnectedServices\GDrive\GDriveController', 'deleteImportedFile' ]
 );
diff --git a/lib/Routes/utils_routes.php b/lib/Routes/utils_routes.php
index 8257acc793..562214c94e 100644
--- a/lib/Routes/utils_routes.php
+++ b/lib/Routes/utils_routes.php
@@ -9,111 +9,111 @@
 
 global $klein;
 
-route( '/api/app/teams/[i:id_team]/[:team_name]/members/public', 'GET', '\API\App\TeamPublicMembersController', 'publicList' );
+route( '/api/app/teams/[i:id_team]/[:team_name]/members/public', 'GET', [ '\API\App\TeamPublicMembersController', 'publicList' ] );
 
 // Authentication
 $klein->with( '/api/app/user', function () {
 
-    route( '', 'GET', 'API\App\Authentication\UserController', 'show' );
-    route( '/password/change', 'POST', 'API\App\Authentication\UserController', 'changePasswordAsLoggedUser' );
+    route( '', 'GET', [ 'API\App\Authentication\UserController', 'show' ] );
+    route( '/password/change', 'POST', [ 'API\App\Authentication\UserController', 'changePasswordAsLoggedUser' ] );
 
-    route( '/login', 'POST', 'API\App\Authentication\LoginController', 'login' );
-    route( '/logout', 'POST', 'API\App\Authentication\LoginController', 'logout' );
-    route( '/login/token', 'GET', 'API\App\Authentication\LoginController', 'token' );
+    route( '/login', 'POST', [ 'API\App\Authentication\LoginController', 'login' ] );
+    route( '/logout', 'POST', [ 'API\App\Authentication\LoginController', 'logout' ] );
+    route( '/login/token', 'GET', [ 'API\App\Authentication\LoginController', 'token' ] );
 
-    route( '/metadata', 'POST', 'API\App\UserMetadataController', 'update' );
+    route( '/metadata', 'POST', [ 'API\App\UserMetadataController', 'update' ] );
 
-    route( '', 'POST', 'API\App\Authentication\SignupController', 'create' );
-    route( '/confirm/[:token]', 'GET', 'API\App\Authentication\SignupController', 'confirm' );
-    route( '/resend_email_confirm', 'POST', 'API\App\Authentication\SignupController', 'resendConfirmationEmail' );
+    route( '', 'POST', [ 'API\App\Authentication\SignupController', 'create' ] );
+    route( '/confirm/[:token]', 'GET', [ 'API\App\Authentication\SignupController', 'confirm' ] );
+    route( '/resend_email_confirm', 'POST', [ 'API\App\Authentication\SignupController', 'resendConfirmationEmail' ] );
 
-    route( '/forgot_password', 'POST', 'API\App\Authentication\ForgotPasswordController', 'forgotPassword' );
-    route( '/password_reset/[:token]', 'GET', 'API\App\Authentication\ForgotPasswordController', 'authForPasswordReset' );
-    route( '/password', 'POST', 'API\App\Authentication\ForgotPasswordController', 'setNewPassword' );
+    route( '/forgot_password', 'POST', [ 'API\App\Authentication\ForgotPasswordController', 'forgotPassword' ] );
+    route( '/password_reset/[:token]', 'GET', [ 'API\App\Authentication\ForgotPasswordController', 'authForPasswordReset' ] );
+    route( '/password', 'POST', [ 'API\App\Authentication\ForgotPasswordController', 'setNewPassword' ] );
 
-    route( '/redeem_project', 'POST', 'API\App\Authentication\UserController', 'redeemProject' );
+    route( '/redeem_project', 'POST', [ 'API\App\Authentication\UserController', 'redeemProject' ] );
 
 } );
 
-route( '/api/app/connected_services/[:id_service]/verify', 'GET', 'ConnectedServices\ConnectedServicesController', 'verify' );
-route( '/api/app/connected_services/[:id_service]', 'POST', 'ConnectedServices\ConnectedServicesController', 'update' );
+route( '/api/app/connected_services/[:id_service]/verify', 'GET', [ 'ConnectedServices\ConnectedServicesController', 'verify' ] );
+route( '/api/app/connected_services/[:id_service]', 'POST', [ 'ConnectedServices\ConnectedServicesController', 'update' ] );
 
-route( '/api/app/teams/members/invite/[:jwt]', 'GET', '\API\App\TeamsInvitationsController', 'collectBackInvitation' );
+route( '/api/app/teams/members/invite/[:jwt]', 'GET', [ '\API\App\TeamsInvitationsController', 'collectBackInvitation' ] );
 
-route( '/api/app/outsource/confirm/[i:id_job]/[:password]', 'POST', '\API\App\OutsourceConfirmationController', 'confirm' );
+route( '/api/app/outsource/confirm/[i:id_job]/[:password]', 'POST', [ '\API\App\OutsourceConfirmationController', 'confirm' ] );
 
-route( '/api/app/jobs/[i:id_job]/[:password]/completion-events/[:id_event]', 'DELETE', 'Features\ProjectCompletion\Controller\CompletionEventController', 'delete' );
+route( '/api/app/jobs/[i:id_job]/[:password]/completion-events/[:id_event]', 'DELETE', [ 'Features\ProjectCompletion\Controller\CompletionEventController', 'delete' ] );
 
 //Health check
-route( '/api/app/heartbeat/ping', 'GET', '\API\App\HeartBeat', 'ping' );
+route( '/api/app/heartbeat/ping', 'GET', [ '\API\App\HeartBeat', 'ping' ] );
 
 $klein->with( '/api/app/jobs/[:id_job]/[:password]', function () {
-    route( '', 'GET', '\API\V3\ChunkController', 'show' );
-    route( '/quality-report', 'GET', '\Features\ReviewExtended\Controller\API\QualityReportController', 'show' ); // alias of /api/v2/jobs/[:id_job]/[:password]/quality-report
-    route( '/quality-report/segments', 'GET', 'Features\ReviewExtended\Controller\API\QualityReportController', 'segments_for_ui' ); // alias of /api/v2/jobs/[:id_job]/[:password]/quality-report/segments
+    route( '', 'GET', [ '\API\V3\ChunkController', 'show' ] );
+    route( '/quality-report', 'GET', [ '\Features\ReviewExtended\Controller\API\QualityReportController', 'show' ] ); // alias of /api/v2/jobs/[:id_job]/[:password]/quality-report
+    route( '/quality-report/segments', 'GET', [ 'Features\ReviewExtended\Controller\API\QualityReportController', 'segments_for_ui' ] ); // alias of /api/v2/jobs/[:id_job]/[:password]/quality-report/segments
 } );
 
-route( '/api/app/jobs/[:id_job]/[:password]/stats', 'GET', 'API\App\StatsController', 'stats' );
-route( '/api/app/jobs/[:id_job]/[:password]/segments', 'POST', 'API\App\FilesController', 'segments' );
+route( '/api/app/jobs/[:id_job]/[:password]/stats', 'GET', [ 'API\App\StatsController', 'stats' ] );
+route( '/api/app/jobs/[:id_job]/[:password]/segments', 'POST', [ 'API\App\FilesController', 'segments' ] );
 
 $klein->with( '/api/app/api-key', function () {
-    route( '/create', 'POST', '\API\App\ApiKeyController', 'create' );
-    route( '/show', 'GET', '\API\App\ApiKeyController', 'show' );
-    route( '/delete', 'DELETE', '\API\App\ApiKeyController', 'delete' );
+    route( '/create', 'POST', [ '\API\App\ApiKeyController', 'create' ] );
+    route( '/show', 'GET', [ '\API\App\ApiKeyController', 'show' ] );
+    route( '/delete', 'DELETE', [ '\API\App\ApiKeyController', 'delete' ] );
 } );
 
-route( '/api/app/projects/[:id_project]/[:password]/segment-analysis', 'GET', 'API\V3\SegmentAnalysisController', 'project' ); // to be deleted from here
-route( '/api/app/jobs/[:id_job]/[:password]/segment-analysis', 'GET', 'API\V3\SegmentAnalysisController', 'job' );     // to be deleted from here
+route( '/api/app/projects/[:id_project]/[:password]/segment-analysis', 'GET', [ 'API\V3\SegmentAnalysisController', 'project' ] ); // to be deleted from here
+route( '/api/app/jobs/[:id_job]/[:password]/segment-analysis', 'GET', [ 'API\V3\SegmentAnalysisController', 'job' ] );     // to be deleted from here
 
-route( '/api/app/projects/[:id_project]/[:password]/quality-framework', 'GET', 'API\App\QualityFrameworkController', 'project' );
-route( '/api/app/jobs/[:id_job]/[:password]/quality-framework', 'GET', 'API\App\QualityFrameworkController', 'job' );
+route( '/api/app/projects/[:id_project]/[:password]/quality-framework', 'GET', [ 'API\App\QualityFrameworkController', 'project' ] );
+route( '/api/app/jobs/[:id_job]/[:password]/quality-framework', 'GET', [ 'API\App\QualityFrameworkController', 'job' ] );
 
-route( '/api/app/change-password', 'POST', 'API\V2\ChangePasswordController', 'changePassword' );
+route( '/api/app/change-password', 'POST', [ 'API\V2\ChangePasswordController', 'changePassword' ] );
 
 // TM Keys
 $klein->with( '/api/app/tm-keys', function () {
-    route( '/[:id_job]/[:password]', 'GET', '\API\App\TmKeyManagementController', 'getByJob' );
+    route( '/[:id_job]/[:password]', 'GET', [ '\API\App\TmKeyManagementController', 'getByJob' ] );
 } );
 
 // Glossary
 $klein->with( '/api/app/glossary', function () {
-    route( '/_check', 'POST', '\API\App\GlossaryController', 'check' );
-    route( '/_delete', 'POST', '\API\App\GlossaryController', 'delete' );
-    route( '/_domains', 'POST', '\API\App\GlossaryController', 'domains' );
-    route( '/_get', 'POST', '\API\App\GlossaryController', 'get' );
-    route( '/_keys', 'POST', '\API\App\GlossaryController', 'keys' );
-    route( '/_search', 'POST', '\API\App\GlossaryController', 'search' );
-    route( '/_set', 'POST', '\API\App\GlossaryController', 'set' );
-    route( '/_update', 'POST', '\API\App\GlossaryController', 'update' );
+    route( '/_check', 'POST', [ '\API\App\GlossaryController', 'check' ] );
+    route( '/_delete', 'POST', [ '\API\App\GlossaryController', 'delete' ] );
+    route( '/_domains', 'POST', [ '\API\App\GlossaryController', 'domains' ] );
+    route( '/_get', 'POST', [ '\API\App\GlossaryController', 'get' ] );
+    route( '/_keys', 'POST', [ '\API\App\GlossaryController', 'keys' ] );
+    route( '/_search', 'POST', [ '\API\App\GlossaryController', 'search' ] );
+    route( '/_set', 'POST', [ '\API\App\GlossaryController', 'set' ] );
+    route( '/_update', 'POST', [ '\API\App\GlossaryController', 'update' ] );
 } );
 
 // AI Assistant
-route( '/api/app/ai-assistant', 'POST', 'API\App\AIAssistantController', 'index' );
+route( '/api/app/ai-assistant', 'POST', [ 'API\App\AIAssistantController', 'index' ] );
 
 $klein->with( '/api/app/languages', function () {
-    route( '', 'GET', '\API\App\SupportedLanguagesController', 'index' );
+    route( '', 'GET', [ '\API\App\SupportedLanguagesController', 'index' ] );
 } );
 
 $klein->with( '/api/app/files', function () {
-    route( '', 'GET', '\API\App\SupportedFilesController', 'index' );
+    route( '', 'GET', [ '\API\App\SupportedFilesController', 'index' ] );
 } );
 
 //PAYABLE RATES
 $klein->with( '/api/app/payable_rate', function () {
-    route( '/default', 'GET', '\API\V3\PayableRateController', 'default' );
+    route( '/default', 'GET', [ '\API\V3\PayableRateController', 'default' ] );
 } );
 
 //QA MODELS
 $klein->with( '/api/app/qa_model_template', function () {
-    route( '/default', 'GET', '\API\V3\QAModelTemplateController', 'default' );
+    route( '/default', 'GET', [ '\API\V3\QAModelTemplateController', 'default' ] );
 } );
 
 // PROJECT TEMPLATE
 $klein->with( '/api/app/project-template', function () {
-    route( '/default', 'GET', '\API\V3\ProjectTemplateController', 'default' );
+    route( '/default', 'GET', [ '\API\V3\ProjectTemplateController', 'default' ] );
 } );
 
 // FILTERS CONFIG
 $klein->with( '/api/app/filters-config-template', function () {
-    route( '/default', 'GET', '\API\V3\FiltersConfigTemplateController', 'default' );
+    route( '/default', 'GET', [ '\API\V3\FiltersConfigTemplateController', 'default' ] );
 } );
diff --git a/router.php b/router.php
index cb72b48a62..2330b63a4c 100644
--- a/router.php
+++ b/router.php
@@ -16,13 +16,20 @@
 
 $klein = new Klein();
 
-function route( $path, $method, $controller, $action ) {
+/**
+ * @param string $path
+ * @param string $method
+ * @param array  $callback
+ *
+ * @return void
+ */
+function route( string $path, string $method, array $callback ) {
     global $klein;
 
-    $klein->respond( $method, $path, function () use ( $controller, $action ) {
-        $reflect  = new ReflectionClass( $controller );
+    $klein->respond( $method, $path, function () use ( $callback ) {
+        $reflect  = new ReflectionClass( $callback[ 0 ] );
         $instance = $reflect->newInstanceArgs( func_get_args() );
-        $instance->respond( $action );
+        $instance->respond( $callback[ 1 ] );
     } );
 }