diff --git a/AgentsPerQueue.sopm b/AgentsPerQueue.sopm
index 27c368a..4162569 100755
--- a/AgentsPerQueue.sopm
+++ b/AgentsPerQueue.sopm
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <otrs_package version="1.0">
     <Name>AgentsPerQueue</Name>
-    <Version>1.1.0</Version>
-    <Framework>4.0.x</Framework>
+    <Version>1.2.0</Version>
+    <Framework>5.0.x</Framework>
     <Vendor>SeTIC - UFSC</Vendor>
     <URL>http://setic.ufsc.br</URL>
     <License>GPLv2</License>
     <Description>Agents per queue</Description>
+    <ChangeLog Version="1.2.0">Adjustments for OTRS 5.0.x</ChangeLog>
     <ChangeLog Version="1.1.0">Adjustments for OTRS 4.0.4</ChangeLog>
     <Description>Agents per queue module</Description>
     <IntroInstall Type="post" Title="Thank you">Agents per queue module installed successfully!</IntroInstall>
@@ -16,6 +17,6 @@
         <File Permission="644" Location="Kernel/Config/Files/AgentsPerQueue.xml"></File>
         <File Permission="644" Location="Kernel/Language/pt_BR_AgentsPerQueue.pm"></File>
         <File Permission="644" Location="Kernel/Modules/AgentsPerQueue.pm"></File>
-        <File Permission="644" Location="Kernel/Output/HTML/Standard/AgentsPerQueue.tt"></File>
+        <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/AgentsPerQueue.tt"></File>
     </Filelist>
 </otrs_package>
\ No newline at end of file
diff --git a/CreateOpm.sh b/CreateOpm.sh
index 4d3c82e..81a42e9 100755
--- a/CreateOpm.sh
+++ b/CreateOpm.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 LOCAL="$PWD"
-cd /opt/otrs/bin
-./otrs.PackageManager.pl -a build -p "$LOCAL"/AgentsPerQueue.sopm -o "$LOCAL"/
+cd /opt/otrs
+bin/otrs.Console.pl Dev::Package::Build "$LOCAL"/AgentsPerQueue.sopm "$LOCAL"/
 cd $LOCAL
diff --git a/Kernel/Output/HTML/Standard/AgentsPerQueue.tt b/Kernel/Output/HTML/Standard/AgentsPerQueue.tt
deleted file mode 100644
index 5874936..0000000
--- a/Kernel/Output/HTML/Standard/AgentsPerQueue.tt
+++ /dev/null
@@ -1,36 +0,0 @@
-# --
-# ResponsibilityMatrix.tt - provides HTML for ResponsibilityMatrix
-# 
-# Copyright (C) 2014 SeTIC - UFSC - http://setic.ufsc.br/
-# Version 01/15/2015 - Adjustments for OTRS 4
-#
-#
-# This software comes with ABSOLUTELY NO WARRANTY. For details, see
-# the enclosed file COPYING for license information (AGPL). If you
-# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
-# --
-#
-
-<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst"><h1>[% Translate("Queues per agent") | html %]</h1></div>
-<table class="DataTable SpacingTop" style="width: 80%; margin-left: 10%; margin-bottom: 50px;">
-<thead>
-<tr>
-<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("ID") | html %]</th>
-<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("Agent") | html %]</th>
-<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("Paths") | html %]</th>
-<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("Queues") | html %]</th>
-</tr>
-</thead>
-<tbody>
-[% RenderBlockStart("QueuesPerAgent") %]
-<tr><td>[% Data.ID %]</td><td>[% Data.Agent %]</td>
-<td>
-<div style="width:100%; max-height:200px; overflow:auto">[% Data.Paths %]</div>
-</td>
-<td>
-<div style="width:100%; max-height:200px; overflow:auto">[% Data.Queues %]</div>
-</td>
-</tr>
-[% RenderBlockEnd("QueuesPerAgent") %]
-</tbody>
-</table>
\ No newline at end of file
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentsPerQueue.tt b/Kernel/Output/HTML/Templates/Standard/AgentsPerQueue.tt
new file mode 100644
index 0000000..5874936
--- /dev/null
+++ b/Kernel/Output/HTML/Templates/Standard/AgentsPerQueue.tt
@@ -0,0 +1,36 @@
+# --
+# ResponsibilityMatrix.tt - provides HTML for ResponsibilityMatrix
+# 
+# Copyright (C) 2014 SeTIC - UFSC - http://setic.ufsc.br/
+# Version 01/15/2015 - Adjustments for OTRS 4
+#
+#
+# This software comes with ABSOLUTELY NO WARRANTY. For details, see
+# the enclosed file COPYING for license information (AGPL). If you
+# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
+# --
+#
+
+<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst"><h1>[% Translate("Queues per agent") | html %]</h1></div>
+<table class="DataTable SpacingTop" style="width: 80%; margin-left: 10%; margin-bottom: 50px;">
+<thead>
+<tr>
+<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("ID") | html %]</th>
+<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("Agent") | html %]</th>
+<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("Paths") | html %]</th>
+<th ROWSPAN="1" style="text-align: center; vertical-align: middle">[% Translate("Queues") | html %]</th>
+</tr>
+</thead>
+<tbody>
+[% RenderBlockStart("QueuesPerAgent") %]
+<tr><td>[% Data.ID %]</td><td>[% Data.Agent %]</td>
+<td>
+<div style="width:100%; max-height:200px; overflow:auto">[% Data.Paths %]</div>
+</td>
+<td>
+<div style="width:100%; max-height:200px; overflow:auto">[% Data.Queues %]</div>
+</td>
+</tr>
+[% RenderBlockEnd("QueuesPerAgent") %]
+</tbody>
+</table>
\ No newline at end of file
diff --git a/SQLs.txt b/SQLs.txt
new file mode 100644
index 0000000..d42e7be
--- /dev/null
+++ b/SQLs.txt
@@ -0,0 +1,24 @@
+select 
+	'Manage' AS `type`,
+	concat(`d`.`first_name`,' ',`d`.`last_name`) AS `user`,
+	`a`.`name` AS `queue` 
+from 
+	(((`queue` `a` join `group_role` `b` on((`b`.`group_id` = `a`.`group_id`))) 
+	join `role_user` `c` on((`c`.`role_id` = `b`.`role_id`))) 
+	join `users` `d` on((`d`.`id` = `c`.`user_id`))) 
+where 
+	((`a`.`valid_id` = 1) and (`b`.`permission_key` = 'rw') and 
+	(`b`.`permission_value` = 1) and ((`a`.`name` like 'N3%') or (`a`.`name` like 'N2%')) and (`d`.`valid_id` = 1)) 
+union 
+	select 'Path' AS `type`,concat(`d`.`first_name`,' ',`d`.`last_name`) AS `user`,
+	`a`.`name` AS `queue` from (((`queue` `a` join `group_role` `b` on((`b`.`group_id` = `a`.`group_id`))) 
+	join `role_user` `c` on((`c`.`role_id` = `b`.`role_id`))) join `users` `d` on((`d`.`id` = `c`.`user_id`))) 
+	where ((`a`.`valid_id` = 1) and (`d`.`valid_id` = 1) and (`b`.`permission_key` = 'move_into') 
+	and (`b`.`permission_value` = 1) and (`a`.`name` like 'N2%') and (not(exists(select `a1`.`id` 
+	from ((`queue` `a1` join `group_role` `b1` on((`b1`.`group_id` = `a1`.`group_id`))) 
+	join `role_user` `c1` on((`c1`.`role_id` = `b1`.`role_id`))) where ((`a1`.`valid_id` = 1)
+	 and (`b1`.`permission_key` = 'rw') and (`b1`.`permission_value` = 1) and (`a1`.`name` like 'N2%') and
+	  (`c1`.`user_id` = `d`.`id`))))) and (not(exists(select `a1`.`id` from ((`queue` `a1` join `group_role` `b1` 
+	  on((`b1`.`group_id` = `a1`.`group_id`))) join `role_user` `c1` on((`c1`.`role_id` = `b1`.`role_id`))) 
+	  where ((`a1`.`valid_id` = 1) and (`b1`.`permission_key` = 'rw') and (`b1`.`permission_value` = 1) 
+	  and (`a1`.`name` like 'Primeiro%') and (`c1`.`user_id` = `d`.`id`))))))
--
libgit2 0.21.2