diff --git a/function.php b/function.php
index 0c9bf438..ed873626 100644
--- a/function.php
+++ b/function.php
@@ -415,12 +415,12 @@ if (!function_exists('redis')) {
 
 
 	/**
-	 * @return \Kiri\Redis\Redis|Redis
+	 * @return \Kiri\NoSql\Redis|Redis
 	 * @throws
 	 */
-	function redis(): \Kiri\Redis\Redis|Redis
+	function redis(): \Kiri\NoSql\Redis|Redis
 	{
-		return Kiri::getDi()->get(\Kiri\Redis\Redis::class);
+		return Kiri::getDi()->get(\Kiri\NoSql\Redis::class);
 	}
 }
 
@@ -437,19 +437,6 @@ if (!function_exists('fire')) {
 	}
 }
 
-if (!function_exists('exif_imagetype')) {
-
-	/**
-	 * @param $name
-	 * @return string
-	 */
-	function exif_imagetype($name): string
-	{
-		return get_file_extension($name);
-	}
-}
-
-
 if (!function_exists('trim_blank')) {
 
 
@@ -477,245 +464,6 @@ if (!function_exists('trim_blank')) {
 	}
 }
 
-
-if (!function_exists('get_file_extension')) {
-
-	function get_file_extension($filename): bool|int|string
-	{
-		$mime_types = [
-			'txt'  => 'text/plain',
-			'htm'  => 'text/html',
-			'html' => 'text/html',
-			'php'  => 'text/html',
-			'css'  => 'text/css',
-			'js'   => 'application/javascript',
-			'json' => 'application/json',
-			'xml'  => 'application/xml',
-			'swf'  => 'application/x-shockwave-flash',
-			'flv'  => 'video/x-flv',
-
-			// images
-			'png'  => 'image/png',
-			'jpeg' => 'image/jpeg',
-			'gif'  => 'image/gif',
-			'bmp'  => 'image/bmp',
-			'ico'  => 'image/vnd.microsoft.icon',
-			'tiff' => 'image/tiff',
-			'svg'  => 'image/svg+xml',
-
-			// archives
-			'zip'  => 'application/zip',
-			'rar'  => 'application/x-rar-compressed',
-			'exe'  => 'application/x-msdownload',
-			'msi'  => 'application/x-msdownload',
-			'cab'  => 'application/vnd.ms-cab-compressed',
-
-			// audio/video
-			'mp3'  => 'audio/mpeg',
-			'qt'   => 'video/quicktime',
-			'mov'  => 'video/quicktime',
-
-			// adobe
-			'pdf'  => 'application/pdf',
-			'psd'  => 'image/vnd.adobe.photoshop',
-			'ai'   => 'application/postscript',
-			'eps'  => 'application/postscript',
-			'ps'   => 'application/postscript',
-
-			// ms office
-			'doc'  => 'application/msword',
-			'rtf'  => 'application/rtf',
-			'xls'  => 'application/vnd.ms-excel',
-			'ppt'  => 'application/vnd.ms-powerpoint',
-
-			// open office
-			'odt'  => 'application/vnd.oasis.opendocument.text',
-			'ods'  => 'application/vnd.oasis.opendocument.spreadsheet',
-
-
-			'323'     => 'text / h323',
-			'acx'     => 'application/internet-property-stream',
-			'aif'     => 'audio/x-aiff',
-			'aifc'    => 'audio/x-aiff',
-			'aiff'    => 'audio/x-aiff',
-			'asf'     => 'video/x-ms-asf',
-			'asr'     => 'video/x-ms-asf',
-			'asx'     => 'video/x-ms-asf',
-			'au'      => 'audio/basic',
-			'avi'     => 'video/x-msvideo',
-			'axs'     => 'application/olescript',
-			'bas'     => 'text/plain',
-			'bcpio'   => 'application/x-bcpio',
-			'bin'     => 'application/octet-stream',
-			'c'       => 'text/plain',
-			'cat'     => 'application/vnd.ms-pkiseccat',
-			'cdf'     => 'application/x-cdf',
-			'cer'     => 'application/x-x509-ca-cert',
-			'class'   => 'application/octet-stream',
-			'clp'     => 'application/x-msclip',
-			'cmx'     => 'image/x-cmx',
-			'cod'     => 'image/cis-cod',
-			'cpio'    => 'application/x-cpio',
-			'crd'     => 'application/x-mscardfile',
-			'crl'     => 'application/pkix-crl',
-			'crt'     => 'application/x-x509-ca-cert',
-			'csh'     => 'application/x-csh',
-			'dcr'     => 'application/x-director',
-			'der'     => 'application/x-x509-ca-cert',
-			'dir'     => 'application/x-director',
-			'dll'     => 'application/x-msdownload',
-			'dms'     => 'application/octet-stream',
-			'dot'     => 'application/msword',
-			'dvi'     => 'application/x-dvi',
-			'dxr'     => 'application/x-director',
-			'etx'     => 'text/x-setext',
-			'evy'     => 'application/envoy',
-			'fif'     => 'application/fractals',
-			'flr'     => 'x-world/x-vrml',
-			'gtar'    => 'application/x-gtar',
-			'gz'      => 'application/x-gzip',
-			'h'       => 'text/plain',
-			'hdf'     => 'application/x-hdf',
-			'hlp'     => 'application/winhlp',
-			'hqx'     => 'application/mac-binhex40',
-			'hta'     => 'application/hta',
-			'htc'     => 'text/x-component',
-			'htt'     => 'text/webviewhtml',
-			'ief'     => 'image/ief',
-			'iii'     => 'application/x-iphone',
-			'ins'     => 'application/x-internet-signup',
-			'isp'     => 'application/x-internet-signup',
-			'jfif'    => 'image/pipeg',
-			'jpe'     => 'image/jpeg',
-			'jpg'     => 'image/jpeg',
-			'latex'   => 'application/x-latex',
-			'lha'     => 'application/octet-stream',
-			'lsf'     => 'video/x-la-asf',
-			'lsx'     => 'video/x-la-asf',
-			'lzh'     => 'application/octet-stream',
-			'm13'     => 'application/x-msmediaview',
-			'm14'     => 'application/x-msmediaview',
-			'm3u'     => 'audio/x-mpegurl',
-			'man'     => 'application/x-troff-man',
-			'mdb'     => 'application/x-msaccess',
-			'me'      => 'application/x-troff-me',
-			'mht'     => 'message/rfc822',
-			'mhtml'   => 'message/rfc822',
-			'mid'     => 'audio/mid',
-			'mny'     => 'application/x-msmoney',
-			'movie'   => 'video/x-sgi-movie',
-			'mp2'     => 'video/mpeg',
-			'mpa'     => 'video/mpeg',
-			'mpe'     => 'video/mpeg',
-			'mpeg'    => 'video/mpeg',
-			'mpg'     => 'video/mpeg',
-			'mpp'     => 'application/vnd.ms-project',
-			'mpv2'    => 'video/mpeg',
-			'ms'      => 'application/x-troff-ms',
-			'mvb'     => 'application/x-msmediaview',
-			'nws'     => 'message/rfc822',
-			'oda'     => 'application/oda',
-			'p10'     => 'application/pkcs10',
-			'p12'     => 'application/x-pkcs12',
-			'p7b'     => 'application/x-pkcs7-certificates',
-			'p7c'     => 'application/x-pkcs7-mime',
-			'p7m'     => 'application/x-pkcs7-mime',
-			'p7r'     => 'application/x-pkcs7-certreqresp',
-			'p7s'     => 'application/x-pkcs7-signature',
-			'pbm'     => 'image/x-portable-bitmap',
-			'pfx'     => 'application/x-pkcs12',
-			'pgm'     => 'image/x-portable-graymap',
-			'pko'     => 'application/ynd.ms-pkipko',
-			'pma'     => 'application/x-perfmon',
-			'pmc'     => 'application/x-perfmon',
-			'pml'     => 'application/x-perfmon',
-			'pmr'     => 'application/x-perfmon',
-			'pmw'     => 'application/x-perfmon',
-			'pnm'     => 'image/x-portable-anymap',
-			'pot'     => 'application/vnd.ms-powerpoint',
-			'ppm'     => 'image/x-portable-pixmap',
-			'pps'     => 'application/vnd.ms-powerpoint',
-			'prf'     => 'application/pics-rules',
-			'pub'     => 'application/x-mspublisher',
-			'ra'      => 'audio/x-pn-realaudio',
-			'ram'     => 'audio/x-pn-realaudio',
-			'ras'     => 'image/x-cmu-raster',
-			'rgb'     => 'image/x-rgb',
-			'rmi'     => 'audio/mid',
-			'roff'    => 'application/x-troff',
-			'rtx'     => 'text/richtext',
-			'scd'     => 'application/x-msschedule',
-			'sct'     => 'text/scriptlet',
-			'setpay'  => 'application/set-payment-initiation',
-			'setreg'  => 'application/set-registration-initiation',
-			'sh'      => 'application/x-sh',
-			'shar'    => 'application/x-shar',
-			'sit'     => 'application/x-stuffit',
-			'snd'     => 'audio/basic',
-			'spc'     => 'application/x-pkcs7-certificates',
-			'spl'     => 'application/futuresplash',
-			'src'     => 'application/x-wais-source',
-			'sst'     => 'application/vnd.ms-pkicertstore',
-			'stl'     => 'application/vnd.ms-pkistl',
-			'stm'     => 'text/html',
-			'sv4cpio' => 'application/x-sv4cpio',
-			'sv4crc'  => 'application/x-sv4crc',
-			't'       => 'application/x-troff',
-			'tar'     => 'application/x-tar',
-			'tcl'     => 'application/x-tcl',
-			'tex'     => 'application/x-tex',
-			'texi'    => 'application/x-texinfo',
-			'texinfo' => 'application/x-texinfo',
-			'tgz'     => 'application/x-compressed',
-			'tif'     => 'image/tiff',
-			'tr'      => 'application/x-troff',
-			'trm'     => 'application/x-msterminal',
-			'tsv'     => 'text/tab-separated-values',
-			'uls'     => 'text/iuls',
-			'ustar'   => 'application/x-ustar',
-			'vcf'     => 'text/x-vcard',
-			'vrml'    => 'x-world/x-vrml',
-			'wav'     => 'audio/x-wav',
-			'wcm'     => 'application/vnd.ms-works',
-			'wdb'     => 'application/vnd.ms-works',
-			'wks'     => 'application/vnd.ms-works',
-			'wmf'     => 'application/x-msmetafile',
-			'wps'     => 'application/vnd.ms-works',
-			'wri'     => 'application/x-mswrite',
-			'wrl'     => 'x-world/x-vrml',
-			'wrz'     => 'x-world/x-vrml',
-			'xaf'     => 'x-world/x-vrml',
-			'xbm'     => 'image/x-xbitmap',
-			'xla'     => 'application/vnd.ms-excel',
-			'xlc'     => 'application/vnd.ms-excel',
-			'xlm'     => 'application/vnd.ms-excel',
-			'xlt'     => 'application/vnd.ms-excel',
-			'xlw'     => 'application/vnd.ms-excel',
-			'xof'     => 'x-world/x-vrml',
-			'xpm'     => 'image/x-xpixmap',
-			'xwd'     => 'image/x-xwindowdump',
-			'z'       => 'application/x-compress',
-		];
-
-		$explode = explode('.', $filename);
-		$ext     = strtolower(array_pop($explode));
-		if (array_key_exists($ext, $mime_types)) {
-			return $ext;
-		} else if (function_exists('finfo_open')) {
-			$fInfo    = finfo_open(FILEINFO_MIME);
-			$mimeType = finfo_file($fInfo, $filename);
-//			finfo_close($fInfo);
-			$mimeType = current(explode('; ', $mimeType));
-			if (!($search = array_search($mimeType, $mime_types))) {
-				return $mimeType;
-			}
-			return $search;
-		} else {
-			return 'application/octet-stream';
-		}
-	}
-}
-
 if (!function_exists('storage')) {
 
 	/**