diff --git a/api/canned/index.php b/api/canned/index.php
index 810dec85..7a713696 100644
--- a/api/canned/index.php
+++ b/api/canned/index.php
@@ -5,32 +5,20 @@ define('API_PATH', '../');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(API_PATH . 'core/output.php');
+require(API_PATH . 'dao/canned_dao.php');
 
 hesk_load_api_database_functions();
 hesk_dbConnect();
 
 // Routing
-if (isset($_GET['id'])) {
-    $response = hesk_dbQuery("SELECT `id`, `message`, `title`, `reply_order` FROM `"
-        . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` WHERE `id` = ".intval($_GET['id']));
-    if (hesk_dbNumRows($response) == 0) {
-        return http_response_code(404);
+$request_method = $_SERVER['REQUEST_METHOD'];
+if ($request_method == 'GET') {
+    if (isset($_GET['id'])) {
+        $results = get_canned_response($hesk_settings, $_GET['id']);
+    } else {
+        $results = get_canned_response($hesk_settings);
     }
-    $result = hesk_dbFetchAssoc($response);
-    $result['title'] = hesk_html_entity_decode($result['title']);
-    $result['message'] = hesk_html_entity_decode($result['message']);
-
-    output($result);
-}
-
-$response = hesk_dbQuery("SELECT `id`, `message`, `title`, `reply_order` FROM `"
-    . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies`");
-$results = [];
-while ($row = hesk_dbFetchAssoc($response)) {
-    $row['title'] = hesk_html_entity_decode($row['title']);
-    $row['message'] = hesk_html_entity_decode($row['message']);
-    $results[] = $row;
-}
-header('Content-Type: application/json');
-print json_encode($results);
-return http_response_code(200);
\ No newline at end of file
+    output($results);
+} else {
+    return http_response_code(405);
+}
\ No newline at end of file
diff --git a/api/dao/canned_dao.php b/api/dao/canned_dao.php
new file mode 100644
index 00000000..37f17aaa
--- /dev/null
+++ b/api/dao/canned_dao.php
@@ -0,0 +1,23 @@
+<?php
+
+function get_canned_response($hesk_settings, $id = NULL) {
+    $sql = "SELECT `id`, `message`, `title`, `reply_order` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` ";
+    if ($id != NULL) {
+        $sql .= "WHERE `id` = ".intval($id);
+    }
+
+    $response = hesk_dbQuery($sql);
+
+    if (hesk_dbNumRows($response) == 0) {
+        return NULL;
+    }
+
+    $results = [];
+    while ($row = hesk_dbFetchAssoc($response)) {
+        $row['title'] = hesk_html_entity_decode($row['title']);
+        $row['message'] = hesk_html_entity_decode($row['message']);
+        $results[] = $row;
+    }
+
+    return $id == NULL ? $results : $results[0];
+}
\ No newline at end of file
diff --git a/api/dao/ticket_template_dao.php b/api/dao/ticket_template_dao.php
new file mode 100644
index 00000000..43f45e85
--- /dev/null
+++ b/api/dao/ticket_template_dao.php
@@ -0,0 +1,23 @@
+<?php
+
+function get_ticket_template($hesk_settings, $id = NULL) {
+    $sql = "SELECT `id`, `message`, `title`, `tpl_order` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` ";
+    if ($id != NULL) {
+        $sql .= "WHERE `id` = ".intval($id);
+    }
+
+    $response = hesk_dbQuery($sql);
+
+    if (hesk_dbNumRows($response) == 0) {
+        return NULL;
+    }
+
+    $results = [];
+    while ($row = hesk_dbFetchAssoc($response)) {
+        $row['title'] = hesk_html_entity_decode($row['title']);
+        $row['message'] = hesk_html_entity_decode($row['message']);
+        $results[] = $row;
+    }
+
+    return $id == NULL ? $results : $results[0];
+}
\ No newline at end of file
diff --git a/api/ticket-template/index.php b/api/ticket-template/index.php
index 5b718598..7300d3a7 100644
--- a/api/ticket-template/index.php
+++ b/api/ticket-template/index.php
@@ -1,36 +1,25 @@
 <?php
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../../');
+define('API_PATH', '../');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
+require(API_PATH . 'core/output.php');
+require(API_PATH . 'dao/ticket_template_dao.php');
 
 hesk_load_api_database_functions();
 hesk_dbConnect();
 
 // Routing
-if (isset($_GET['id'])) {
-    $response = hesk_dbQuery("SELECT `id`, `message`, `title`, `tpl_order` FROM `"
-        . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` WHERE `id` = ".intval($_GET['id']));
-    if (hesk_dbNumRows($response) == 0) {
-        return http_response_code(404);
+$request_method = $_SERVER['REQUEST_METHOD'];
+
+if ($request_method == 'GET') {
+    if (isset($_GET['id'])) {
+        $results = get_ticket_template($hesk_settings, $_GET['id']);
+    } else {
+        $results = get_ticket_template($hesk_settings);
     }
-    $result = hesk_dbFetchAssoc($response);
-    $result['title'] = hesk_html_entity_decode($result['title']);
-    $result['message'] = hesk_html_entity_decode($result['message']);
-
-    header('Content-Type: application/json');
-    print json_encode($result);
-    return http_response_code(200);
-}
-
-$response = hesk_dbQuery("SELECT `id`, `message`, `title`, `tpl_order` FROM `"
-    . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates`");
-$results = [];
-while ($row = hesk_dbFetchAssoc($response)) {
-    $row['title'] = hesk_html_entity_decode($row['title']);
-    $row['message'] = hesk_html_entity_decode($row['message']);
-    $results[] = $row;
-}
-header('Content-Type: application/json');
-print json_encode($results);
-return http_response_code(200);
\ No newline at end of file
+    output($results);
+} else {
+    return http_response_code(405);
+}
\ No newline at end of file