diff --git a/dbd/qq/SYS_SAIMOD_LOCALE_ADD.php b/dbd/qq/SYS_SAIMOD_LOCALE_ADD.php
new file mode 100644
index 0000000..56b58f7
--- /dev/null
+++ b/dbd/qq/SYS_SAIMOD_LOCALE_ADD.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_LOCALE_ADD extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'INSERT INTO '.\SYSTEM\DBD\system_locale_string::NAME_PG.' (id, category) VALUES ($1, $2);',
+//mys
+'INSERT INTO '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' (id, category) VALUES (?, ?);'
+);}}
diff --git a/dbd/qq/SYS_SAIMOD_LOCALE_CATEGORY.php b/dbd/qq/SYS_SAIMOD_LOCALE_CATEGORY.php
new file mode 100644
index 0000000..1b77836
--- /dev/null
+++ b/dbd/qq/SYS_SAIMOD_LOCALE_CATEGORY.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_LOCALE_CATEGORY extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT "category", COUNT(*) as "count" FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' GROUP BY "category" ORDER BY "category" ASC;',
+//mys
+'SELECT `category`, COUNT(*) as `count` FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' GROUP BY `category` ORDER BY `category` ASC;'
+);}}
diff --git a/dbd/qq/SYS_SAIMOD_LOCALE_DEL.php b/dbd/qq/SYS_SAIMOD_LOCALE_DEL.php
new file mode 100644
index 0000000..af5070d
--- /dev/null
+++ b/dbd/qq/SYS_SAIMOD_LOCALE_DEL.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_LOCALE_DEL extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'DELETE FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE id=$1;',
+//mys
+'DELETE FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE id=?;'
+);}}
diff --git a/dbd/qq/SYS_SAIMOD_LOCALE_ID.php b/dbd/qq/SYS_SAIMOD_LOCALE_ID.php
new file mode 100644
index 0000000..61a0101
--- /dev/null
+++ b/dbd/qq/SYS_SAIMOD_LOCALE_ID.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_LOCALE_ID extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE id = $1 ORDER BY "category" ASC;',
+//mys
+'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE id = ? ORDER BY "category" ASC;'
+);}}
diff --git a/dbd/qq/SYS_SAIMOD_LOCALE_SELECT.php b/dbd/qq/SYS_SAIMOD_LOCALE_SELECT.php
new file mode 100644
index 0000000..1a6b082
--- /dev/null
+++ b/dbd/qq/SYS_SAIMOD_LOCALE_SELECT.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_LOCALE_SELECT extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' ORDER BY "category" ASC;',
+//mys
+'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' ORDER BY category ASC;'
+);}}
diff --git a/readme.md b/readme.md
index b208117..ec83551 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@ System - PHP Framework
 
 License
 =======
-Copyright (c) 2013 TU-Darmstadt, Ulf Gebhardt
+Copyright (c) 2013-2014 Ulf Gebhardt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.php b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
index 2aebcb3..ab885e2 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale.php
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
@@ -9,13 +9,8 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
 
     public static function sai_mod__SYSTEM_SAI_saimod_sys_locale(){        
         $vars = array();                        
-                                                                
-        $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->query('SELECT "category", COUNT(*) as "count" FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' GROUP BY "category" ORDER BY "category" ASC;');
-        } else {
-            $res = $con->query('SELECT `category`, COUNT(*) as `count` FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' GROUP BY `category` ORDER BY `category` ASC;');
-        }
+
+        $res = \SYSTEM\DBD\SYS_SAIMOD_LOCALE_CATEGORY::QQ();
                 
         $vars['tabopts'] = '';
         $first = true;
@@ -26,18 +21,13 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
             $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tabopt.tpl'), $vars2);
         }       
                 
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->query('SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' ORDER BY "category" ASC;');
-        } else {
-            $res = $con->query('SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' ORDER BY category ASC;');
-        }
-                
         $langhead = '';
         foreach (self::getLanguages() as $lang){
             $langhead .= '<th>'.$lang.'</th>'; 
             $languages[] = $lang;
         }         
-        
+
+        $res = \SYSTEM\DBD\SYS_SAIMOD_LOCALE_SELECT::QQ();
         $tabs = array();
         while($r = $res->next()){            
             $tabs[$r['category']]['tab_id'] = $r['category'];            
@@ -73,45 +63,19 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no rows affected")) : \SYSTEM\LOG\JsonResult::ok();
     }
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_add($id, $category){
-         $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
-         $res = null;
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->prepare('addText' ,'INSERT INTO '.\SYSTEM\DBD\system_locale_string::NAME_PG.' (id, category) VALUES ($1, $2);', array($id, $category));
-        } else {
-            $res = $con->prepare('addText' ,'INSERT INTO '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' (id, category) VALUES (?, ?);', array($id, $category));
-        }
-        return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no data added")) : \SYSTEM\LOG\JsonResult::ok();
-    }
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_add($id, $category){                
+        return \SYSTEM\DBD\SYS_SAIMOD_LOCALE_ADD::QI(array($id, $category)) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no data added"));}
+        
     public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_addmode(){
          $vars = array();         
-         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/add.tpl'), $vars);         
-    }
+         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/add.tpl'), $vars);}
     
     public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_delete($id){
-         $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
-         $res = null;
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->prepare('deleteText' ,'DELETE FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE id=$1;', array($id));
-        } else {
-            $res = $con->prepare('deleteText' ,'DELETE FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE id=?;', array($id));
-        }
-        return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("could not delete the permitted data")) : \SYSTEM\LOG\JsonResult::ok();
-    }
+        return \SYSTEM\DBD\SYS_SAIMOD_LOCALE_DEL::QI(array($id)) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("could not delete the permitted data"));}
     
     public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_editmode($entry){
-        $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
-        $res = null;
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->prepare(   'edit',
-                                    'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE id = $1 ORDER BY "category" ASC;',
-                                    array($entry));
-        } else {
-            $res = $con->prepare(   'edit',
-                                    'SELECT * FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE id = ? ORDER BY "category" ASC;',
-                                    array($entry));
-        }
-        if(!$r = $res->next()){
+        $r = \SYSTEM\DBD\SYS_SAIMOD_LOCALE_ID::Q1(array($entry));        
+        if(!$r){
             throw new \SYSTEM\LOG\ERROR("No such Entry found!");}
             
         $vars = array();