diff --git a/bin/v_add_cron_job b/bin/v_add_cron_job
index 7fd935a6..52747fc2 100755
--- a/bin/v_add_cron_job
+++ b/bin/v_add_cron_job
@@ -38,11 +38,14 @@ check_args '7' "$#" 'user min hour day month wday command [job]'
 format_validation 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
 
 # Checking cron system
-is_system_enabled 'cron'
+is_system_enabled 'CRON_SYSTEM'
 
 # Checking user
 is_user_valid
 
+# Checking package
+is_package_full 'CRON_JOBS'
+
 # Get str position
 if [ -z "$job" ]; then
     job=$(get_next_cron_string)
diff --git a/bin/v_add_db_base b/bin/v_add_db_base
index 4dfaa46c..4c9e8e3d 100755
--- a/bin/v_add_db_base
+++ b/bin/v_add_db_base
@@ -42,7 +42,7 @@ check_args '5' "$#" 'user db db_user db_password type [host] [encoding]'
 format_validation 'user' 'database' 'db_user' 'db_password' 'encoding'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking db type
 is_type_valid 'db' "$type"
@@ -63,7 +63,7 @@ fi
 is_db_host_valid
 
 # Checking package
-is_package_full 'db_base'
+is_package_full 'DATABASES'
 
 
 #----------------------------------------------------------#
diff --git a/bin/v_add_db_host b/bin/v_add_db_host
index 4c8789bd..04980492 100755
--- a/bin/v_add_db_host
+++ b/bin/v_add_db_host
@@ -43,7 +43,7 @@ format_validation 'host' 'port' 'db_user' 'db_password' 'max_db'
 format_validation 'template'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking db type
 is_type_valid 'db' "$type"
diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain
index 0ea254de..87e5ee95 100755
--- a/bin/v_add_dns_domain
+++ b/bin/v_add_dns_domain
@@ -43,7 +43,7 @@ check_args '3' "$#" 'user domain ip [template] [exp] [soa] [ttl]'
 format_validation 'user' 'domain' 'ip' 'template' 'exp' 'ttl'
 
 # Checking dns system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
@@ -55,7 +55,7 @@ is_user_suspended
 is_domain_new 'dns'
 
 # Checking package
-is_package_full 'dns'
+is_package_full 'DNS_DOMAINS'
 
 # Checking template
 is_template_valid 'dns'
diff --git a/bin/v_add_dns_domain_record b/bin/v_add_dns_domain_record
index e8a5dc8e..c19c1b20 100755
--- a/bin/v_add_dns_domain_record
+++ b/bin/v_add_dns_domain_record
@@ -42,7 +42,7 @@ check_args '5' "$#" 'user domain record type value [id]'
 format_validation 'user' 'domain' 'record' 'rtype' 'dvalue'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
@@ -56,6 +56,9 @@ is_domain_valid 'dns'
 # Checking domain is active
 is_domain_suspended 'dns'
 
+# Checking package                                                              
+is_package_full 'DNS_RECORDS'
+
 # Defining if emtpy
 if [ -z "$id"] ; then
     id=$(get_next_dns_record)
diff --git a/bin/v_add_mail_domain b/bin/v_add_mail_domain
index e91141c5..c7b70c0b 100755
--- a/bin/v_add_mail_domain
+++ b/bin/v_add_mail_domain
@@ -29,13 +29,13 @@ source $V_FUNC/domain.func
 #----------------------------------------------------------#
 
 # Checking arg number
-check_args '3' "$#" 'user domain [antispam] [antivirus]'
+check_args '2' "$#" 'user domain [antispam] [antivirus]'
 
 # Checking argument format
 format_validation 'user' 'domain' 'antispam' 'antivirus'
 
 # Checking dns system is enabled
-is_system_enabled 'mail'
+is_system_enabled 'MAIL_SYSTEM'
 
 # Checking user
 is_user_valid
@@ -44,18 +44,11 @@ is_user_valid
 is_user_suspended
 
 # Checking domain
-is_domain_new 'quiet'
-if [ $? -ne 0 ]; then
-
-    # Checking domain owner
-    is_domain_owner
-
-    # Checking domain service
-    is_dns_domain_free
-fi
+is_domain_new 'mail'
 
 # Checking package
-is_package_full 'mail'
+is_package_full 'MAIL_DOMAINS'
+
 
 exit
 
diff --git a/bin/v_add_user_backup b/bin/v_add_user_backup
index 470c847d..2682ba7d 100755
--- a/bin/v_add_user_backup
+++ b/bin/v_add_user_backup
@@ -29,7 +29,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking backup system is enabled
-is_system_enabled 'backup'
+is_system_enabled 'BACKUP_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain
index c240fe7a..14cf6408 100755
--- a/bin/v_add_web_domain
+++ b/bin/v_add_web_domain
@@ -41,7 +41,7 @@ check_args '3' "$#" 'user domain ip [template]'
 format_validation 'user' 'domain' 'ip' 'template'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
@@ -56,7 +56,7 @@ is_domain_new 'dns'
 is_ip_avalable
 
 # Checking package
-is_package_full 'web_domain'
+is_package_full 'WEB_DOMAINS'
 
 # Checking template
 templates=$(get_user_value '$WEB_TPL')
diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias
index 6e7a990d..3a850b3e 100755
--- a/bin/v_add_web_domain_alias
+++ b/bin/v_add_web_domain_alias
@@ -37,7 +37,7 @@ check_args '3' "$#" 'user domain dom_alias'
 format_validation 'user' 'domain' 'dom_alias'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
@@ -55,7 +55,7 @@ is_domain_suspended 'web'
 is_domain_new 'web' "$dom_alias"
 
 # Checking package
-is_package_full 'web_alias'
+is_package_full 'WEB_ALIASES'
 
 
 #----------------------------------------------------------#
diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi
index 1b0c55a2..42e705c3 100755
--- a/bin/v_add_web_domain_cgi
+++ b/bin/v_add_web_domain_cgi
@@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_add_web_domain_elog b/bin/v_add_web_domain_elog
index 6d7e9cf6..157a3c05 100755
--- a/bin/v_add_web_domain_elog
+++ b/bin/v_add_web_domain_elog
@@ -33,7 +33,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl
index 35b3b93e..8ebc5f75 100755
--- a/bin/v_add_web_domain_ssl
+++ b/bin/v_add_web_domain_ssl
@@ -40,7 +40,7 @@ check_args '3' "$#" 'user domain ssl_dir [ssl_home]'
 format_validation 'user' 'domain' 'ssl_dir'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
@@ -54,9 +54,6 @@ is_domain_valid 'web'
 # Checking domain is not suspened
 is_domain_suspended 'web'
 
-# Checking package
-is_package_full 'web_ssl'
-
 # Check ssl is not added
 is_domain_key_empty 'web' '$SSL'
 
diff --git a/bin/v_add_web_domain_stat b/bin/v_add_web_domain_stat
index ed014263..152a340a 100755
--- a/bin/v_add_web_domain_stat
+++ b/bin/v_add_web_domain_stat
@@ -37,7 +37,7 @@ check_args '3' "$#" 'user domain type'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid "$user"
diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth
index 7f282677..ea9998ae 100755
--- a/bin/v_add_web_domain_stat_auth
+++ b/bin/v_add_web_domain_stat_auth
@@ -33,7 +33,7 @@ check_args '4' "$#" 'user domain auth_user auth_password'
 format_validation 'user' 'domain' 'auth_user' 'auth_pass'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_backup_user b/bin/v_backup_user
index 3a26d2f1..d885e7e2 100755
--- a/bin/v_backup_user
+++ b/bin/v_backup_user
@@ -31,7 +31,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking backup system is enabled
-is_system_enabled 'backup'
+is_system_enabled 'BACKUP_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_cron_job b/bin/v_change_cron_job
index ca9eb357..c72a4eb1 100755
--- a/bin/v_change_cron_job
+++ b/bin/v_change_cron_job
@@ -38,7 +38,7 @@ check_args '7' "$#" 'user job min hour day month wday command'
 format_validation 'user' 'job' 'min' 'hour' 'day' 'month' 'wday' 'command' 
 
 # Checking cron system
-is_system_enabled 'cron'
+is_system_enabled 'CRON_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_db_password b/bin/v_change_db_password
index b96d2bbb..f7485c9b 100755
--- a/bin/v_change_db_password
+++ b/bin/v_change_db_password
@@ -33,7 +33,7 @@ check_args '3' "$#" 'user db_name db_password'
 format_validation 'user' 'database' 'db_password'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_dns_domain_exp b/bin/v_change_dns_domain_exp
index 66806a80..c0c69c7c 100755
--- a/bin/v_change_dns_domain_exp
+++ b/bin/v_change_dns_domain_exp
@@ -34,7 +34,7 @@ check_args '3' "$#" 'user domain exp'
 format_validation 'user' 'domain' 'exp'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_dns_domain_ip b/bin/v_change_dns_domain_ip
index 5c7c447d..10ecfc54 100755
--- a/bin/v_change_dns_domain_ip
+++ b/bin/v_change_dns_domain_ip
@@ -32,7 +32,7 @@ check_args '3' "$#" 'user domain ip'
 format_validation 'user' 'domain' 'ip'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_dns_domain_record b/bin/v_change_dns_domain_record
index ef7f08c1..d1d6c02e 100755
--- a/bin/v_change_dns_domain_record
+++ b/bin/v_change_dns_domain_record
@@ -36,7 +36,7 @@ check_args '5' "$#" 'user domain id record type value'
 format_validation 'user' 'domain' 'id' 'record' 'rtype'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_dns_domain_soa b/bin/v_change_dns_domain_soa
index a38db59a..f3c83e6f 100755
--- a/bin/v_change_dns_domain_soa
+++ b/bin/v_change_dns_domain_soa
@@ -33,7 +33,7 @@ check_args '3' "$#" 'user domain soa'
 format_validation 'user' 'domain' 'soa'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_dns_domain_tpl b/bin/v_change_dns_domain_tpl
index c0ab97a5..8783120b 100755
--- a/bin/v_change_dns_domain_tpl
+++ b/bin/v_change_dns_domain_tpl
@@ -35,7 +35,7 @@ check_args '3' "$#" 'user domain template'
 format_validation 'user' 'domain' 'template'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_dns_domain_ttl b/bin/v_change_dns_domain_ttl
index 578cba0c..dbface52 100755
--- a/bin/v_change_dns_domain_ttl
+++ b/bin/v_change_dns_domain_ttl
@@ -33,7 +33,7 @@ check_args '3' "$#" 'user domain ttl'
 format_validation 'user' 'domain' 'ttl'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_web_domain_ip b/bin/v_change_web_domain_ip
index eccb4ad8..a2cc4d9b 100755
--- a/bin/v_change_web_domain_ip
+++ b/bin/v_change_web_domain_ip
@@ -35,7 +35,7 @@ check_args '3' "$#" 'user domain ip'
 format_validation 'user' 'domain' 'ip'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_web_domain_sslcert b/bin/v_change_web_domain_sslcert
index 05d348ff..c2f272a1 100755
--- a/bin/v_change_web_domain_sslcert
+++ b/bin/v_change_web_domain_sslcert
@@ -34,7 +34,7 @@ check_args '3' "$#" 'user domain ssl_dir'
 format_validation 'user' 'domain' 'ssl_dir'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome
index f715372c..1d832d44 100755
--- a/bin/v_change_web_domain_sslhome
+++ b/bin/v_change_web_domain_sslhome
@@ -29,7 +29,7 @@ check_args '3' "$#" 'user domain ssl_home'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl
index 034236a5..abd04ae8 100755
--- a/bin/v_change_web_domain_tpl
+++ b/bin/v_change_web_domain_tpl
@@ -34,7 +34,7 @@ check_args '3' "$#" 'user domain template'
 format_validation 'user' 'domain' 'template'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_db_base b/bin/v_delete_db_base
index 67e36459..b90ae80d 100755
--- a/bin/v_delete_db_base
+++ b/bin/v_delete_db_base
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user db_name'
 format_validation 'user' 'database'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_db_bases b/bin/v_delete_db_bases
index db73ec37..88227f10 100755
--- a/bin/v_delete_db_bases
+++ b/bin/v_delete_db_bases
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_db_host b/bin/v_delete_db_host
index 5e69ac49..a294b6ae 100755
--- a/bin/v_delete_db_host
+++ b/bin/v_delete_db_host
@@ -32,7 +32,7 @@ check_args '2' "$#" 'type host'
 format_validation 'host'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking db type
 is_type_valid 'db' "$type"
diff --git a/bin/v_delete_dns_domain b/bin/v_delete_dns_domain
index 331b5f0b..5c1ad199 100755
--- a/bin/v_delete_dns_domain
+++ b/bin/v_delete_dns_domain
@@ -33,7 +33,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_dns_domains b/bin/v_delete_dns_domains
index ef122d19..a04d3a7f 100755
--- a/bin/v_delete_dns_domains
+++ b/bin/v_delete_dns_domains
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain
index fa4a02c3..80a6870e 100755
--- a/bin/v_delete_web_domain
+++ b/bin/v_delete_web_domain
@@ -36,7 +36,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain_alias b/bin/v_delete_web_domain_alias
index 1444adb2..42a328cf 100755
--- a/bin/v_delete_web_domain_alias
+++ b/bin/v_delete_web_domain_alias
@@ -35,7 +35,7 @@ check_args '3' "$#" 'user domain dom_alias'
 format_validation 'user' 'domain' 'dom_alias'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain_cgi b/bin/v_delete_web_domain_cgi
index 58c7c74e..cc0ad024 100755
--- a/bin/v_delete_web_domain_cgi
+++ b/bin/v_delete_web_domain_cgi
@@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain_elog b/bin/v_delete_web_domain_elog
index 8017b92a..13acef30 100755
--- a/bin/v_delete_web_domain_elog
+++ b/bin/v_delete_web_domain_elog
@@ -34,7 +34,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid "$user"
diff --git a/bin/v_delete_web_domain_nginx b/bin/v_delete_web_domain_nginx
index c0a2e4d0..87b16e44 100755
--- a/bin/v_delete_web_domain_nginx
+++ b/bin/v_delete_web_domain_nginx
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain_ssl b/bin/v_delete_web_domain_ssl
index 7f5c6cbf..befd4124 100755
--- a/bin/v_delete_web_domain_ssl
+++ b/bin/v_delete_web_domain_ssl
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain_stat b/bin/v_delete_web_domain_stat
index 6d03f43f..ab5b3c9e 100755
--- a/bin/v_delete_web_domain_stat
+++ b/bin/v_delete_web_domain_stat
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domain_stat_auth b/bin/v_delete_web_domain_stat_auth
index 9ebdc19d..db0066f8 100755
--- a/bin/v_delete_web_domain_stat_auth
+++ b/bin/v_delete_web_domain_stat_auth
@@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain [auth_user]'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_delete_web_domains b/bin/v_delete_web_domains
index 5ac9c780..7b228ddb 100755
--- a/bin/v_delete_web_domains
+++ b/bin/v_delete_web_domains
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_rebuild_cron_jobs b/bin/v_rebuild_cron_jobs
index c85116e4..b7059c7e 100755
--- a/bin/v_rebuild_cron_jobs
+++ b/bin/v_rebuild_cron_jobs
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking cron system
-is_system_enabled 'cron'
+is_system_enabled 'CRON_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_rebuild_dns_domains b/bin/v_rebuild_dns_domains
index 365089d4..c52e76a3 100755
--- a/bin/v_rebuild_dns_domains
+++ b/bin/v_rebuild_dns_domains
@@ -31,7 +31,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking dns system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains
index 787d3cc7..b5cdf78d 100755
--- a/bin/v_rebuild_web_domains
+++ b/bin/v_rebuild_web_domains
@@ -32,7 +32,7 @@ check_args '1' "$#" 'user [suspend_url]'
 format_validation 'user' 'url'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_restore_user b/bin/v_restore_user
index c46fe562..e48d7276 100755
--- a/bin/v_restore_user
+++ b/bin/v_restore_user
@@ -73,7 +73,7 @@ check_args '2' "$#" 'user backup'
 format_validation 'user' 'backup'
 
 # Checking backup system is enabled
-is_system_enabled 'backup'
+is_system_enabled 'BACKUP_SYSTEM'
 
 # Checking load averages
 la=$(cat /proc/loadavg |cut -f 1 -d ' '|cut -f 1 -d '.')
diff --git a/bin/v_suspend_db_base b/bin/v_suspend_db_base
index 028e5832..331a9915 100755
--- a/bin/v_suspend_db_base
+++ b/bin/v_suspend_db_base
@@ -31,7 +31,7 @@ check_args '2' "$#" 'user db_name'
 format_validation 'user' 'database'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_suspend_db_bases b/bin/v_suspend_db_bases
index 9f801de9..cde3115a 100755
--- a/bin/v_suspend_db_bases
+++ b/bin/v_suspend_db_bases
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_suspend_dns_domain b/bin/v_suspend_dns_domain
index 3d0745d5..4fcce559 100755
--- a/bin/v_suspend_dns_domain
+++ b/bin/v_suspend_dns_domain
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_suspend_dns_domains b/bin/v_suspend_dns_domains
index 3d3b4b0a..220e40ef 100755
--- a/bin/v_suspend_dns_domains
+++ b/bin/v_suspend_dns_domains
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking dns system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_suspend_web_domain b/bin/v_suspend_web_domain
index 3dfb0253..f3b06fb9 100755
--- a/bin/v_suspend_web_domain
+++ b/bin/v_suspend_web_domain
@@ -37,7 +37,7 @@ check_args '2' "$#" 'user domain [suspend_url]'
 format_validation 'user' 'domain' 'url'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_suspend_web_domains b/bin/v_suspend_web_domains
index 41fae134..d8039306 100755
--- a/bin/v_suspend_web_domains
+++ b/bin/v_suspend_web_domains
@@ -33,7 +33,7 @@ check_args '1' "$#" 'user [suspend_url]'
 format_validation 'user' 'url'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_unsuspend_db_base b/bin/v_unsuspend_db_base
index b4c857ec..957f0bb9 100755
--- a/bin/v_unsuspend_db_base
+++ b/bin/v_unsuspend_db_base
@@ -31,7 +31,7 @@ check_args '2' "$#" 'user db_name'
 format_validation 'user' 'database'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_unsuspend_db_bases b/bin/v_unsuspend_db_bases
index 73dd01c3..ee53f3b9 100755
--- a/bin/v_unsuspend_db_bases
+++ b/bin/v_unsuspend_db_bases
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking db system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_unsuspend_dns_domain b/bin/v_unsuspend_dns_domain
index 20e9625b..ca92ee0d 100755
--- a/bin/v_unsuspend_dns_domain
+++ b/bin/v_unsuspend_dns_domain
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_unsuspend_dns_domains b/bin/v_unsuspend_dns_domains
index 967ee994..82909688 100755
--- a/bin/v_unsuspend_dns_domains
+++ b/bin/v_unsuspend_dns_domains
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking dns system is enabled
-is_system_enabled 'dns'
+is_system_enabled 'DNS_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain
index 6cab6a5a..4bed7408 100755
--- a/bin/v_unsuspend_web_domain
+++ b/bin/v_unsuspend_web_domain
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_unsuspend_web_domains b/bin/v_unsuspend_web_domains
index c4c89552..6c6c2f7e 100755
--- a/bin/v_unsuspend_web_domains
+++ b/bin/v_unsuspend_web_domains
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_db_base_disk b/bin/v_update_db_base_disk
index 6baa4e6b..a405b5d2 100755
--- a/bin/v_update_db_base_disk
+++ b/bin/v_update_db_base_disk
@@ -31,7 +31,7 @@ check_args '2' "$#" 'user db_name'
 format_validation 'user' 'database'
 
 # Checking web system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_db_bases_disk b/bin/v_update_db_bases_disk
index aa1d2b74..3f1dca33 100755
--- a/bin/v_update_db_bases_disk
+++ b/bin/v_update_db_bases_disk
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'db'
+is_system_enabled 'DB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_user_backups b/bin/v_update_user_backups
index b725947b..26b52069 100755
--- a/bin/v_update_user_backups
+++ b/bin/v_update_user_backups
@@ -190,7 +190,7 @@ check_ftp_connection(){
 check_args '1' "$#" 'user'
 
 # Checking backup system is enabled
-is_system_enabled 'backup'
+is_system_enabled 'BACKUP_SYSTEM'
 
 # Checking argument format
 format_validation 'user'
diff --git a/bin/v_update_web_domain_disk b/bin/v_update_web_domain_disk
index b2cb19e8..51f67574 100755
--- a/bin/v_update_web_domain_disk
+++ b/bin/v_update_web_domain_disk
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_web_domain_stat b/bin/v_update_web_domain_stat
index 20576264..2df51374 100755
--- a/bin/v_update_web_domain_stat
+++ b/bin/v_update_web_domain_stat
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_web_domain_traff b/bin/v_update_web_domain_traff
index 1faecf23..c66fc7b2 100755
--- a/bin/v_update_web_domain_traff
+++ b/bin/v_update_web_domain_traff
@@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
 format_validation 'user' 'domain'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_web_domains_disk b/bin/v_update_web_domains_disk
index eeec0096..bd75fa1f 100755
--- a/bin/v_update_web_domains_disk
+++ b/bin/v_update_web_domains_disk
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_web_domains_stat b/bin/v_update_web_domains_stat
index d6b824e9..c7c1fac2 100755
--- a/bin/v_update_web_domains_stat
+++ b/bin/v_update_web_domains_stat
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid
diff --git a/bin/v_update_web_domains_traff b/bin/v_update_web_domains_traff
index a7da9cec..69f7d4c7 100755
--- a/bin/v_update_web_domains_traff
+++ b/bin/v_update_web_domains_traff
@@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
 format_validation 'user'
 
 # Checking web system is enabled
-is_system_enabled 'web'
+is_system_enabled 'WEB_SYSTEM'
 
 # Checking user
 is_user_valid "$user"
diff --git a/func/shared.func b/func/shared.func
index fe863ce7..87ae89f6 100644
--- a/func/shared.func
+++ b/func/shared.func
@@ -418,65 +418,12 @@ format_validation() {
 
 # Sub system checker
 is_system_enabled() {
-    stype="$1"
-
-    web_function() {
-        if [ -z "$WEB_SYSTEM" ] || [ "$WEB_SYSTEM" = "no" ]; then
-            echo "Error: web hosting support disabled"
-            log_event 'debug' "$E_DISABLED $V_EVENT"
-            exit $E_DISABLED
-        fi
-    }
-
-    proxy_function() {
-        if [ "$PROXY_SYSTEM" != 'nginx' ]; then
-            echo "Error: proxy hosting support disabled"
-            log_event 'debug' "$E_DISABLED $V_EVENT"
-            exit $E_DISABLED
-        fi
-    }
-
-    dns_function() {
-        if [ -z "$DNS_SYSTEM" ] || [ "$DNS_SYSTEM" = "no" ]; then
-            echo "Error: dns support disabled"
-            log_event 'debug' "$E_DISABLED $V_EVENT"
-            exit $E_DISABLED
-        fi
-    }
-
-    cron_function() {
-        if [ -z "$CRON_SYSTEM" ] || [ "$CRON_SYSTEM" = "no" ]; then
-            echo "Error: crond support disabled"
-            log_event 'debug' "$E_DISABLED $V_EVENT"
-            exit $E_DISABLED
-        fi
-    }
-
-    db_function() {
-        if [ -z "$DB_SYSTEM" ] || [ "$DB_SYSTEM" = "no" ]; then
-            echo "Error: db support disabled"
-            log_event 'debug' "$E_DISABLED $V_EVENT"
-            exit $E_DISABLED
-        fi
-    }
-
-    backup_function() {
-        if [ -z "$BACKUP_SYSTEM" ] || [ "$BACKUP_SYSTEM" = "no" ]; then
-            echo "Error: backup support disabled"
-            log_event 'debug' "$E_DISABLED $V_EVENT"
-            exit $E_DISABLED
-        fi
-    }
-
-    case $stype in
-        web) web_function ;;
-        proxy) proxy_function ;;
-        dns) dns_function ;;
-        cron) cron_function ;;
-        db) db_function ;;
-        backup) backup_function ;;
-        *) check_args '1' '0' 'system'
-    esac
+    eval system=\$$1
+    if [ -z "$system" ] || [ "$system" = "no" ]; then
+        echo "Error: $system disabled"
+        log_event 'debug' "$E_DISABLED $V_EVENT"
+        exit $E_DISABLED
+    fi
 }
 
 # System user check
@@ -508,99 +455,25 @@ is_user_suspended() {
 
 # User package check
 is_package_full() {
-    stype="$1"
-
-    web_domain() {
-        # Checking zero domains
-        domain_number=$(wc -l $V_USERS/$user/web.conf|cut -f 1 -d ' ')
-
-        # Comparing current val with conf
-        val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' )
-        if [ "$domain_number" -ge "$val" ]; then
-            echo "Error: Upgrade package"
-            log_event 'debug' "$E_LIMIT $v_log"
-            exit $E_LIMIT
-        fi
-    }
-
-    web_alias() {
-        # Parsing aliases
-        alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf|\
-            awk -F "ALIAS=" '{print $2}' | cut -f 2 -d \' |\
-            sed -e "s/,/\n/g" | wc -l )
-
-        # Parsing config
-        val=$(grep 'WEB_ALIASES=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
-        if [ "$alias_nmb" -ge "$val" ]; then
-            echo "Error: Upgrade package"
-            log_event 'debug' "$E_LIMIT $v_log"
-            exit $E_LIMIT
-        fi
-    }
-
-    web_ssl() {
-        # Parsing config
-        val=$(grep '^WEB_SSL=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
-        if [ "$val" -eq '0' ]; then
-            echo "Error: Upgrade package"
-            log_event 'debug' "$E_LIMIT $v_log"
-            exit $E_LIMIT
-        fi
-
-        # Checking domains
-        domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)
-        # Comparing current val with conf
-        if [ "$domain_nmb" -ge "$val" ]; then
-            echo "Error: Upgrade package"
-            log_event 'debug' "$E_LIMIT $v_log"
-            exit $E_LIMIT
-        fi
-    }
-
-    dns_domain() {
-        # Checking zero domains
-        domain_number=$(wc -l $V_USERS/$user/dns.conf | cut -f 1 -d " ")
-
-        # Comparing current val with conf
-        val=$(grep '^DNS_DOMAINS=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
-        if [ "$domain_number" -ge "$val" ]; then
-            echo "Error: Upgrade package"
-            log_event 'debug' "$E_LIMIT $v_log"
-            exit $E_LIMIT
-        fi
-    }
-
-    db_base() {
-        # Checking zero domains
-        db_number=$(wc -l $V_USERS/$user/db.conf | cut -f 1 -d " ")
-
-        # Comparing current val with conf
-        val=$(grep '^DATABASES=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
-        if [ "$db_number" -ge "$val" ]; then
-            echo "Error: Upgrade package"
-            log_event 'debug' "$E_LIMIT $v_log"
-            exit $E_LIMIT
-        fi
-    }
-
-    # FIXME - should finish other functions
-
-    # Switching
-    case "$stype" in
-        web_domain) web_domain "$user" ;;
-        web_alias) web_alias "$user" "$domain" ;;
-        web_ssl) web_ssl "$user" ;;
-        dns) dns_domain "$user" ;;
-        db_base) db_base "$user" ;;
-        mail_domain) mail_domain "$user" ;;
-        mail_box) mail_box "$user" "$domain";;
-        mail_forwarder) mail_forwarder "$user" "$domain";;
-        *)
-            echo "Error: bad type"
-            log_event 'debug' "$E_INVALID $V_EVENT"
-            exit $E_INVALID 
-            ;;
+    limit=$(grep "^$1=" $V_USERS/$user/user.conf | cut -f 2 -d \' )
+    # Switching on 
+    case "$1" in
+        WEB_DOMAINS) used=$(wc -l $V_USERS/$user/web.conf|cut -f1 -d ' ');;
+        WEB_ALIASES) used=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf |\
+                          awk -F "ALIAS='" '{print $2}' | cut -f 1 -d "'" |\
+                          tr ',' '\n'| wc -l );;
+        DNS_DOMAINS) used=$(wc -l $V_USERS/$user/dns.conf|cut -f1 -d ' ');;
+        DNS_RECORDS) used=$(wc -l $V_USERS/$user/dns/$domain|cut -f1 -d ' ');;
+        MAIL_DOMAINS) used=$(wc -l $V_USERS/$user/mail.conf|cut -f1 -d ' ');;
+        DATABASES) used=$(wc -l $V_USERS/$user/db.conf|cut -f1 -d ' ');;
+        CRON_JOBS) used=$(wc -l $V_USERS/$user/cron.conf|cut -f1 -d ' ');;
     esac
+
+    if [ "$used" -ge "$limit" ]; then
+	echo "Error: Upgrade package"
+        log_event 'debug' "$E_LIMIT $v_log"
+        exit $E_LIMIT
+    fi
 }
 
 is_template_valid() {
@@ -608,7 +481,6 @@ is_template_valid() {
 
     web_template() {
         check_tpl=$(echo "$templates"|sed -e "s/,/\n/g"|grep  "^$template$")
-
         tpl="$V_WEBTPL/apache_$template.tpl"
         descr="$V_WEBTPL/apache_$template.descr"
         ssl="$V_WEBTPL/apache_$template.stpl"