diff --git a/.gitignore b/.gitignore
index d094d36..ace654b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /nbproject/
 /composer.lock
-/Nette/
\ No newline at end of file
+/Nette/
+.idea/
+vendor/
diff --git a/MultipleFileUpload/Extension.php b/MultipleFileUpload/Extension.php
new file mode 100644
index 0000000..fc9cfbf
--- /dev/null
+++ b/MultipleFileUpload/Extension.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace MultipleFileUpload;
+
+use Nette;
+
+class Extension extends Nette\DI\CompilerExtension 
+{
+
+	public function loadConfiguration() {
+		$builder = $this->getContainerBuilder();
+		$this->compiler->parseServices($builder, $this->loadFromFile(__DIR__ . '/config.neon'));
+	}
+	
+	
+	public function beforeCompile() {
+		parent::beforeCompile();
+	}
+	
+	
+	public function afterCompile(Nette\PhpGenerator\ClassType $class) {
+		$initialize = $class->methods['initialize'];
+
+		// add ->addMultipleFileUpload shortcut into forms
+		$initialize->addBody(
+			'Nette\Forms\Container::extensionMethod(
+				"\Nette\Forms\Container::addMultipleFileUpload",
+				function (\Nette\Forms\Container $_this, $name, $label = null, $maxFileSize = 25) {
+					return $_this[$name] = new MultipleFileUpload\MultipleFileUpload($label, $maxFileSize, $this->getByType(?), $this->getByType(?)); 
+				}
+			);',
+			['Nette\Http\IRequest', 'MultipleFileUpload\UI\Registrator']
+		);
+
+		$initialize->addBody(
+			'MultipleFileUpload\MultipleFileUpload::init(
+				$this->getByType(?), $this->getByType(?), $this->getByType(?)
+			);',
+			['MultipleFileUpload\Model\IQueues', 'Nette\Http\IRequest', 'MultipleFileUpload\UI\Registrator']
+		);
+
+		$initialize->addBody(
+			'$this->getService(?)->onStartup[] = [?, ?];',
+			['application', 'MultipleFileUpload\MultipleFileUpload', 'handleUploads']
+		);
+		$initialize->addBody(
+			'$this->getService(?)->onShutdown[] = [?, ?];',
+			['application', 'MultipleFileUpload\MultipleFileUpload', 'cleanCache']
+		);
+	}
+
+}
diff --git a/MultipleFileUpload/Model/Dibi/Queue.php b/MultipleFileUpload/Model/Dibi/Queue.php
index 1f7373d..232569b 100644
--- a/MultipleFileUpload/Model/Dibi/Queue.php
+++ b/MultipleFileUpload/Model/Dibi/Queue.php
@@ -13,7 +13,6 @@
 
 use dibi,
 	MultipleFileUpload\Model\BaseQueue,
-	Nette\Environment,
 	Nette\Http\FileUpload,
 	Nette\InvalidStateException;
 
@@ -94,23 +93,19 @@ function updateFile($name, $chunk, FileUpload $file = null)
 	 */
 	function getUploadedFilesTemporaryPath()
 	{
-		if (!Queues::$uploadsTempDir) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%" . DIRECTORY_SEPARATOR . "uploads-MFU");
+		if (!$this->getQueuesModel()->uploadsTempDir) {
+			throw new InvalidStateException("Directory for temp files is not set.");
 		}
 
-		if (!file_exists(Queues::$uploadsTempDir)) {
-			mkdir(Queues::$uploadsTempDir, 0777, true);
+		if (!file_exists($this->getQueuesModel()->uploadsTempDir)) {
+			mkdir($this->getQueuesModel()->uploadsTempDir, 0777, true);
 		}
 
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%");
-		}
-
-		if (!is_writable(Queues::$uploadsTempDir)) {
+		if (!is_writable($this->getQueuesModel()->uploadsTempDir)) {
 			throw new InvalidStateException("Directory for temp files is not writable!");
 		}
 
-		return Queues::$uploadsTempDir;
+		return $this->getQueuesModel()->uploadsTempDir;
 	}
 
 
@@ -163,4 +158,4 @@ function getLastAccess()
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/MultipleFileUpload/Model/Dibi/Queues.php b/MultipleFileUpload/Model/Dibi/Queues.php
index 7d96c05..5fd3729 100644
--- a/MultipleFileUpload/Model/Dibi/Queues.php
+++ b/MultipleFileUpload/Model/Dibi/Queues.php
@@ -11,10 +11,9 @@
 
 namespace MultipleFileUpload\Model\Dibi;
 
-use dibi,
+use DibiConnection,
 	MultipleFileUpload\Model\BaseQueues,
-	MultipleFileUpload\Model\IQueue,
-	Nette\InvalidStateException;
+	MultipleFileUpload\Model\IQueue;
 
 /**
  * Multiple File Uploader driver for Dibi
@@ -28,13 +27,13 @@ class Queues extends BaseQueues
 	 * Path to directory of uploaded files (temp)
 	 * @var string
 	 */
-	public static $uploadsTempDir;
+	public $uploadsTempDir;
 
 	/**
 	 * Connection
-	 * @var \DibiConnection
+	 * @var DibiConnection
 	 */
-	public static $dibiConnection;
+	public $connection;
 
 
 	/**
@@ -45,38 +44,24 @@ function initialize()
 
 	}
 
-
-	// <editor-fold defaultstate="collapsed" desc="Database functions">
-
-	/**
-	 * Gets dibi connection
-	 * @return \DibiConnection
-	 */
-	function getConnection()
+	public function __construct(string $tempDir, DibiConnection $conection)
 	{
-		if (!self::$dibiConnection) {
-			self::$dibiConnection = dibi::getConnection();
+		$this->uploadsTempDir = $tempDir;
+		if(!file_exists($this->uploadsTempDir)) {
+			mkdir($this->uploadsTempDir, 0775, TRUE);
 		}
-		return self::$dibiConnection;
+		$this->conection = $conection;
 	}
 
-
 	/**
-	 * Executes query
-	 * @return \DibiResult
-	 * @throws InvalidStateException
+	 * @return DibiConnection 
 	 */
-	function query()
+	public function getConnection()
 	{
-		$params = func_get_args();
-		return call_user_func_array(
-			array($this->getConnection(), 'query'), $params
-		);
+		return $this->database;
 	}
-
-
-	// </editor-fold>
-
+	
+	
 	/**
 	 * Gets queue (create if needed)
 	 * @param string $id
@@ -95,7 +80,7 @@ function getQueue($id)
 	 */
 	function createQueueObj($queueID)
 	{
-		$queue = new Queue();
+		$queue = new Queue(); // todo: remove setQueuesModel --> move to __construct
 		$queue->setQueuesModel($this);
 		$queue->setQueueID($queueID);
 		$queue->initialize();
@@ -108,13 +93,13 @@ function createQueueObj($queueID)
 	 */
 	function cleanup()
 	{
-		$this->getConnection()->begin();
+		$this->connection->begin();
 		foreach ($this->getQueues() AS $queue) {
 			if ($queue->getLastAccess() < time() - $this->getLifeTime()) {
 				$queue->delete();
 			}
 		}
-		$this->getConnection()->commit();
+		$this->connection->commit();
 	}
 
 
@@ -136,4 +121,4 @@ function getQueues()
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/MultipleFileUpload/Model/IQueue.php b/MultipleFileUpload/Model/IQueue.php
index 25843df..eabd9f1 100644
--- a/MultipleFileUpload/Model/IQueue.php
+++ b/MultipleFileUpload/Model/IQueue.php
@@ -72,7 +72,7 @@ function addFileManually($name, $chunk, $chunks);
 	 * @param type $chunk
 	 * @param FileUpload $file
 	 */
-	function updateFile($name, $chunk, FileUpload $file = null);
+	function updateFile($name, $chunk, FileUpload $file);
 
 	/**
 	 * Gets all files in queue
diff --git a/MultipleFileUpload/Model/NetteDatabase/Queue.php b/MultipleFileUpload/Model/NetteDatabase/Queue.php
index ff6913b..60902a7 100644
--- a/MultipleFileUpload/Model/NetteDatabase/Queue.php
+++ b/MultipleFileUpload/Model/NetteDatabase/Queue.php
@@ -12,7 +12,6 @@
 namespace MultipleFileUpload\Model\NetteDatabase;
 
 use MultipleFileUpload\Model\BaseQueue,
-	Nette\Environment,
 	Nette\Http\FileUpload,
 	Nette\InvalidStateException;
 
@@ -68,8 +67,9 @@ function addFileManually($name, $chunk, $chunks)
 
 	function updateFile($name, $chunk, FileUpload $file = null)
 	{
-		$this->getConnection()->beginTransaction();
-		$selection = $this->getConnection()->table($this->getFilesTable())->where('queueID', $this->getQueueID())->where('name', $name);
+		$connection = $this->getConnection();
+		$connection->beginTransaction();
+		$selection = $connection->table($this->getFilesTable())->where('queueID', $this->getQueueID())->where('name', $name);
 
 		$data = array("chunk" => $chunk);
 		if ($file){
@@ -79,7 +79,7 @@ function updateFile($name, $chunk, FileUpload $file = null)
 		foreach ($selection as $row){
 			$row->update($data);
 		}
-		$this->getConnection()->commit();
+		$connection->commit();
 	}
 
 
@@ -90,17 +90,13 @@ function updateFile($name, $chunk, FileUpload $file = null)
 	function getUploadedFilesTemporaryPath()
 	{
 		if (!Queues::$uploadsTempDir) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%" . DIRECTORY_SEPARATOR . "uploads-MFU");
+			throw new InvalidStateException("Directory for temp files is not set.");
 		}
 
 		if (!file_exists(Queues::$uploadsTempDir)) {
 			mkdir(Queues::$uploadsTempDir, 0777, true);
 		}
 
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%");
-		}
-
 		if (!is_writable(Queues::$uploadsTempDir)) {
 			throw new InvalidStateException("Directory for temp files is not writable!");
 		}
@@ -152,4 +148,4 @@ function getLastAccess()
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/MultipleFileUpload/Model/NetteDatabase/Queues.php b/MultipleFileUpload/Model/NetteDatabase/Queues.php
index 63335f9..99ca727 100644
--- a/MultipleFileUpload/Model/NetteDatabase/Queues.php
+++ b/MultipleFileUpload/Model/NetteDatabase/Queues.php
@@ -13,7 +13,7 @@
 
 use MultipleFileUpload\Model\BaseQueues,
 	MultipleFileUpload\Model\IQueue,
-	Nette\InvalidStateException;
+	Nette;
 
 /**
  * Multiple File Uploader driver for Nette\Database
@@ -48,8 +48,12 @@ public function getFilesTable(){
 		return self::$filesTable;
 	}
 	
-	public function __construct(\Nette\Database\Context $database)
+	public function __construct($tempDir, Nette\Database\Context $database)
 	{
+		self::$uploadsTempDir = $tempDir;
+		if(!file_exists(self::$uploadsTempDir)) {
+			mkdir(self::$uploadsTempDir, 0775, TRUE);
+		}
 		$this->database = $database;
 	}
 	
@@ -122,4 +126,4 @@ function getQueues()
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/MultipleFileUpload/Model/SQLite/.gitignore b/MultipleFileUpload/Model/SQLite/.gitignore
deleted file mode 100644
index 0177c42..0000000
--- a/MultipleFileUpload/Model/SQLite/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/database.sdb
diff --git a/MultipleFileUpload/Model/SQLite/Queue.php b/MultipleFileUpload/Model/SQLite/Queue.php
deleted file mode 100644
index 927517e..0000000
--- a/MultipleFileUpload/Model/SQLite/Queue.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * This file is part of the MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
- *
- * Copyright (c) 2013 Jan Kuchař (http://www.jankuchar.cz)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- */
-
-namespace MultipleFileUpload\Model\SQLite;
-
-use MultipleFileUpload\Model\BaseQueue,
-	Nette\Environment,
-	Nette\Http\FileUpload,
-	Nette\InvalidStateException;
-
-class Queue extends BaseQueue
-{
-
-	/**
-	 * Executes query
-	 * @param string $sql
-	 * @return SQLiteResult
-	 */
-	function query($sql)
-	{
-		return $this->getQueuesModel()->query($sql);
-	}
-
-
-	/**
-	 * Adds file to queue
-	 * @param FileUpload $file
-	 */
-	function addFile(FileUpload $file)
-	{
-		$file->move($this->getUniqueFilePath());
-		$this->query('INSERT INTO files (queueID, created, data, name) VALUES ("' . sqlite_escape_string($this->getQueueID()) . '",' . time() . ',\'' . sqlite_escape_string(serialize($file)) . '\', \'' . sqlite_escape_string($file->getName()) . '\')');
-	}
-
-
-	// TODO: rename!!!
-	function addFileManually($name, $chunk, $chunks)
-	{
-		$this->query('INSERT INTO files (queueID, created, name, chunk, chunks) VALUES ("' . sqlite_escape_string($this->getQueueID()) . '",' . time() . ',\'' . sqlite_escape_string($name) . '\', \'' . sqlite_escape_string($chunk) . '\', \'' . sqlite_escape_string($chunks) . '\')');
-	}
-
-
-	function updateFile($name, $chunk, FileUpload $file = null)
-	{
-		$this->query("BEGIN TRANSACTION");
-		$where = 'queueID = \'' . sqlite_escape_string($this->getQueueID()) . '\' AND name = \'' . sqlite_escape_string($name) . '\'';
-		$this->query('UPDATE files SET chunk = \'' . sqlite_escape_string($chunk) . '\' WHERE ' . $where);
-		if ($file) {
-			$this->query('UPDATE files SET data = \'' . sqlite_escape_string(serialize($file)) . '\' WHERE ' . $where);
-		}
-		$this->query("END TRANSACTION");
-	}
-
-
-	/**
-	 * Gets upload directory path
-	 * @return string
-	 */
-	function getUploadedFilesTemporaryPath()
-	{
-		if (!Queues::$uploadsTempDir) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%" . DIRECTORY_SEPARATOR . "uploads-MFU");
-		}
-
-		if (!file_exists(Queues::$uploadsTempDir)) {
-			mkdir(Queues::$uploadsTempDir, 0777, true);
-		}
-
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%");
-		}
-
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			throw new InvalidStateException("Directory for temp files is not writable!");
-		}
-
-		return Queues::$uploadsTempDir;
-	}
-
-
-	/**
-	 * Gets files
-	 * @return FileUpload[]
-	 */
-	function getFiles()
-	{
-		$files = array();
-
-		foreach ($this->query("SELECT * FROM files WHERE queueID = '" . sqlite_escape_string($this->getQueueID()) . "'")->fetchAll() AS $row) {
-			$f = unserialize($row["data"]);
-			if (!$f instanceof FileUpload)
-				continue;
-			$files[] = $f;
-		}
-		return $files;
-	}
-
-
-	function delete()
-	{
-		$dir = realpath($this->getUploadedFilesTemporaryPath());
-		foreach ($this->getFiles() AS $file) {
-			$fileDir = dirname($file->getTemporaryFile());
-			if (realpath($fileDir) == $dir and file_exists($file->getTemporaryFile())) {
-				// Delete file only if user leaved file in temp directory
-				@unlink($file->getTemporaryFile()); // intentionally @
-			}
-		}
-
-		$this->query("DELETE FROM files  WHERE queueID = '" . sqlite_escape_string($this->getQueueID()) . "'");
-	}
-
-
-	/**
-	 * When was queue last accessed?
-	 * @return int timestamp
-	 */
-	function getLastAccess()
-	{
-		$lastAccess = (int) $this->query("SELECT created
-			FROM files
-			WHERE queueID = '" . sqlite_escape_string($this->getQueueID()) . "'
-			ORDER BY created DESC")->fetchSingle();
-		return $lastAccess;
-	}
-
-
-}
\ No newline at end of file
diff --git a/MultipleFileUpload/Model/SQLite/Queues.php b/MultipleFileUpload/Model/SQLite/Queues.php
deleted file mode 100644
index d26bc25..0000000
--- a/MultipleFileUpload/Model/SQLite/Queues.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * This file is part of the MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
- *
- * Copyright (c) 2013 Jan Kuchař (http://www.jankuchar.cz)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- */
-
-namespace MultipleFileUpload\Model\SQLite;
-
-use MultipleFileUpload\Model\BaseQueues,
-	MultipleFileUpload\Model\IQueue,
-	Nette\Environment,
-	Nette\InvalidStateException;
-
-class Queues extends BaseQueues
-{
-	/**
-	 * @var \SQLiteDatabase
-	 */
-	private $connection;
-
-	/**
-	 * Path to SQLite database file
-	 * @var string|null
-	 */
-	public static $databasePath;
-
-	/**
-	 * Path to directory of uploaded files (temp)
-	 * @var string
-	 */
-	public static $uploadsTempDir;
-
-
-	/**
-	 * Initializes driver
-	 */
-	function initialize()
-	{
-
-	}
-
-
-	// <editor-fold defaultstate="collapsed" desc="Database functions">
-
-	function getConnection()
-	{
-		if (!$this->connection) {
-			$this->connection = $this->openDB();
-
-			// load database
-			if (filesize(self::$databasePath) == 0) {
-				//$this->beginTransaction();
-				$this->connection->queryExec(file_get_contents(dirname(__FILE__) . "/setupDB.sql"), $error);
-				if ($error) {
-					throw new InvalidStateException("Can't create SQLite database: " . $error);
-				}
-				//$this->endTransaction();
-			}
-		}
-		return $this->connection;
-	}
-
-
-	/**
-	 * Executes query
-	 * @param string $sql
-	 * @return SQLiteResult
-	 * @throws InvalidStateException
-	 */
-	function query($sql)
-	{
-		$r = $this->getConnection()->query($sql, SQLITE_ASSOC, $error);
-		if ($error) {
-			throw new InvalidStateException("Can't execute queury: '" . $sql . "'. error: " . $error);
-		}
-		return $r;
-	}
-
-
-	/* function beginTransaction() {
-	  $this->query("BEGIN TRANSACTION");
-	  }
-
-	  function endTransaction() {
-	  $this->query("END TRANSACTION");
-	  } */
-
-	/**
-	 * Open SQLite file
-	 * @return SQLiteDatabase
-	 * @throws InvalidStateException
-	 */
-	function openDB()
-	{
-
-		if (!($connection = new \SQLiteDatabase(self::$databasePath, 0777, $error))) {
-			throw new InvalidStateException("Can't create sqlite database: " . $error);
-		}
-
-		return $connection;
-	}
-
-
-	// </editor-fold>
-
-	/**
-	 * Gets queue (create if needed)
-	 * @param string $id
-	 * @return Queue
-	 */
-	function getQueue($id)
-	{
-		return $this->createQueueObj($id);
-	}
-
-
-	/**
-	 * Queue factory.
-	 * @param string $queueID
-	 * @return Queue
-	 */
-	function createQueueObj($queueID)
-	{
-		$queue = new Queue();
-		$queue->setQueuesModel($this);
-		$queue->setQueueID($queueID);
-		$queue->initialize();
-		return $queue;
-	}
-
-
-	/**
-	 * Executes cleanup
-	 */
-	function cleanup()
-	{
-		$this->query("BEGIN TRANSACTION");
-		foreach ($this->getQueues() AS $queue) {
-			if ($queue->getLastAccess() < time() - $this->getLifeTime()) {
-				$queue->delete();
-			}
-		}
-		$this->query("END TRANSACTION");
-
-		// physically delete files marked for deletion
-		$this->query("VACUUM");
-	}
-
-
-	/**
-	 * Gets all queues
-	 * @return IQueue[]
-	 */
-	function getQueues()
-	{
-		$queuesOut = array();
-		$qs = $this->query("SELECT queueID
-		  FROM files
-		  GROUP BY queueID")->fetchAll();
-
-		foreach ($qs AS $row) {
-			$queuesOut[] = $this->createQueueObj($row["queueID"]);
-		}
-
-		return $queuesOut;
-	}
-
-
-	static function init()
-	{
-		// TODO: remove this magic
-		$config = Environment::getConfig("MultipleFileUploader", array(
-				"databasePath" => dirname(__FILE__) . "/database.sdb",
-				"uploadsTempDir" => ""
-		));
-
-		foreach ($config AS $key => $val) {
-			self::$$key = $val;
-		}
-	}
-
-
-}
-Queues::init();
diff --git a/MultipleFileUpload/Model/SQLite/setupDB.sql b/MultipleFileUpload/Model/SQLite/setupDB.sql
deleted file mode 100644
index 56bab59..0000000
--- a/MultipleFileUpload/Model/SQLite/setupDB.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---Table: files
-
---DROP TABLE files;
-
-CREATE TABLE files (
-  id       integer PRIMARY KEY,
-  queueID  char(13) NOT NULL,
-  created  integer NOT NULL,
-  data     text,
-  chunk    integer NOT NULL DEFAULT 1,
-  chunks   integer NOT NULL DEFAULT 1,
-  name     varchar(255) NOT NULL
-);
-
-CREATE UNIQUE INDEX files_Name
-  ON files
-  (name);
diff --git a/MultipleFileUpload/Model/SQLite3/Queue.php b/MultipleFileUpload/Model/SQLite3/Queue.php
index 87b614e..c0ac36b 100644
--- a/MultipleFileUpload/Model/SQLite3/Queue.php
+++ b/MultipleFileUpload/Model/SQLite3/Queue.php
@@ -13,7 +13,6 @@
 namespace MultipleFileUpload\Model\SQLite3;
 
 use MultipleFileUpload\Model\BaseQueue,
-	Nette\Environment,
 	Nette\Http\FileUpload,
 	Nette\InvalidStateException,
 	SQLite3,
@@ -104,23 +103,19 @@ function updateFile($name, $chunk, FileUpload $file = null)
 
 
 	/**
-	 * Get upload directory path
+	 * Gets upload directory path
 	 * @return string
 	 */
 	function getUploadedFilesTemporaryPath()
 	{
 		if (!Queues::$uploadsTempDir) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%" . DIRECTORY_SEPARATOR . "uploads-MFU");
+			throw new InvalidStateException("Directory for temp files is not set.");
 		}
 
 		if (!file_exists(Queues::$uploadsTempDir)) {
 			mkdir(Queues::$uploadsTempDir, 0777, true);
 		}
 
-		if (!is_writable(Queues::$uploadsTempDir)) {
-			Queues::$uploadsTempDir = Environment::expand("%tempDir%");
-		}
-
 		if (!is_writable(Queues::$uploadsTempDir)) {
 			throw new InvalidStateException("Directory for temp files is not writable!");
 		}
diff --git a/MultipleFileUpload/Model/SQLite3/Queues.php b/MultipleFileUpload/Model/SQLite3/Queues.php
index b6fd9fb..1611d38 100644
--- a/MultipleFileUpload/Model/SQLite3/Queues.php
+++ b/MultipleFileUpload/Model/SQLite3/Queues.php
@@ -14,7 +14,6 @@
 
 use MultipleFileUpload\Model\BaseQueues,
 	MultipleFileUpload\Model\IQueue,
-	Nette\Environment,
 	Nette\InvalidStateException,
 	SQLite3,
 	SQLite3Result,
@@ -23,7 +22,7 @@
 class Queues extends BaseQueues
 {
 	/**
-	 * @var \SQLite3
+	 * @var SQLite3
 	 */
 	private $connection;
 
@@ -48,7 +47,22 @@ function initialize()
 
 	}
 
+	// todo: add to Travis CI parallel lint https://github.com/JakubOnderka/PHP-Parallel-Lint
+	// todo: remove me :-) http://eyeleo.com/
 
+	/**
+	 * */
+	public function __construct($tempDir, $databaseFilePath)
+	{
+		self::$uploadsTempDir = $tempDir;
+		if(!file_exists(self::$uploadsTempDir)) {
+			mkdir(self::$uploadsTempDir, 0775, TRUE);
+		}
+		self::$databasePath = $databaseFilePath;
+		$this->connection = new SQLite3($databaseFilePath);
+	}
+	
+	
 	// <editor-fold defaultstate="collapsed" desc="Database functions">
 
 	function getConnection()
@@ -187,15 +201,7 @@ function getQueues()
 
 	static function init()
 	{
-		// TODO: remove this magic
-		$config = Environment::getConfig('MultipleFileUploader', array(
-				'databasePath' => dirname(__FILE__) . '/database.sqlite3',
-				'uploadsTempDir' => ''
-		));
-
-		foreach ($config AS $key => $val) {
-			self::$$key = $val;
-		}
+
 	}
 
 
diff --git a/MultipleFileUpload/MultipleFileUpload.php b/MultipleFileUpload/MultipleFileUpload.php
index 720f06e..b38f1e3 100644
--- a/MultipleFileUpload/MultipleFileUpload.php
+++ b/MultipleFileUpload/MultipleFileUpload.php
@@ -1,540 +1,527 @@
-<?php
-
-/**
- * MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
- *
- * Copyright (c) 2014 Jan Kuchař (https://github.com/jkuchar), Ciki (https://github.com/Ciki)
- * and contributors https://github.com/jkuchar/MultipleFileUpload/graphs/contributors
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- */
-
-namespace MultipleFileUpload;
-
-use MultipleFileUpload\Model\IQueue,
-	MultipleFileUpload\Model\IQueues,
-	MultipleFileUpload\UI\Registrator,
-	Nette\Environment,
-	Nette\Forms,
-	Nette\Forms\Container,
-	Nette\Forms\Controls\UploadControl,
-	Nette\Http\FileUpload,
-	Nette\InvalidStateException,
-	Nette\NotSupportedException,
-	Nette\Utils\Callback,
-	Nette\Utils\Html,
-	Nette\Utils\Strings;
-
-class MultipleFileUpload extends UploadControl
-{
-	/**
-	 * Is files handle uploads called?
-	 * @var bool
-	 * @see self::handleUploads()
-	 */
-	private static $handleUploadsCalled = false;
-
-	/**
-	 * Model
-	 * @var IQueues
-	 * @see self::init()
-	 */
-	protected static $queuesModel;
-
-	/**
-	 * Validate file callback
-	 * @var Callback
-	 * @return bool
-	 * @param FileUpload File to be checked
-	 */
-	public static $validateFileCallback;
-
-	/**
-	 * Interface registrator instance
-	 * @var Registrator
-	 */
-	public static $interfaceRegistrator;
-
-	/**
-	 * Root of mfu directory in public folder (used for serving js, css, ...)
-	 * @var string
-	 */
-	public static $baseWWWRoot = null;
-
-
-	/**
-	 * Initialize MFU
-	 */
-	public static function init()
-	{
-		// Init UI registrator
-		$uiReg = self::$interfaceRegistrator = new Registrator();
-		$uiReg->register("MultipleFileUpload\\UI\\HTML4SingleUpload");
-		$uiReg->register("MultipleFileUpload\\UI\\Plupload");
-
-		// Set default check callback
-		self::$validateFileCallback = callback(__CLASS__, "validateFile");
-
-		// TODO: remove this magic
-		self::$baseWWWRoot = Environment::getHttpRequest()->url->baseUrl . "MultipleFileUpload/";
-	}
-
-
-	/**
-	 * Register MFU into Nette
-	 */
-	public static function register()
-	{
-		self::init();
-
-		$application = Environment::getApplication();
-		$application->onStartup[] = callback(__CLASS__, "handleUploads");
-		$application->onShutdown[] = callback(__CLASS__, "cleanCache");
-	}
-
-
-	/* ##########  HANDLING UPLOADS  ########### */
-
-	/**
-	 * Sets life time of files in queue (shortcut for self::getQueuesModel()->setLifeTime)
-	 * @param int $lifeTime Time in seconds
-	 */
-	static function setLifeTime($lifeTime)
-	{
-		self::getQueuesModel()
-			->setLifeTime((int) $lifeTime);
-	}
-
-
-	protected static function _doSetLifetime()
-	{
-		// Auto config of lifeTime
-		$maxInputTime = (int) ini_get("max_input_time");
-		// default if no max input time defined (-1)
-		if ($maxInputTime < 0) {
-			$lifeTime = 3600;
-		} else {
-			$lifeTime = $maxInputTime + 5;
-		}
-
-		self::setLifeTime($lifeTime);
-	}
-
-
-	/**
-	 * Handles uploading files
-	 */
-	public static function handleUploads()
-	{
-		if (self::$handleUploadsCalled === true) {
-			return;
-		} else {
-			self::$handleUploadsCalled = true;
-		}
-
-		$req = Environment::getHttpRequest();
-
-		// Workaround for: http://forum.nettephp.com/cs/3680-httprequest-getheaders-a-content-type
-		$contentType = $req->getHeader("content-type");
-		if (!$contentType and isset($_SERVER["CONTENT_TYPE"])) {
-			$contentType = $_SERVER["CONTENT_TYPE"];
-		}
-
-		if ($req->getMethod() !== "POST") {
-			return;
-		}
-
-		self::getQueuesModel()->initialize();
-
-		foreach (self::getUIRegistrator()->getInterfaces() AS $interface) {
-//			\Nette\Diagnostics\Debugger::log($interface->getReflection()->getName().": is this your upload? ".$interface->isThisYourUpload());
-			if ($interface->isThisYourUpload()) {
-				$ret = $interface->handleUploads();
-				if ($ret === true)
-					break;
-			}
-		}
-	}
-
-
-	/**
-	 * Checks file if is ok and can be processed
-	 * @param FileUpload $file
-	 * @return bool
-	 */
-	public static function validateFile(FileUpload $file)
-	{
-		return $file->isOk();
-	}
-
-
-	/**
-	 * Cleans cache
-	 */
-	public static function cleanCache()
-	{
-		if (!Environment::isProduction() or rand(1, 100) < 5) {
-			self::getQueuesModel()->cleanup();
-		}
-	}
-
-
-	/**
-	 * @return IQueues
-	 * @throws InvalidStateException
-	 */
-	public static function getQueuesModel()
-	{
-		if (!self::$queuesModel) { // if nothing is set, setup sqlite model, which should work on all systems with SQLite
-			self::setQueuesModel(new Model\SQLite3\Queues());
-		}
-
-		if (!self::$queuesModel instanceof IQueues) {
-			throw new InvalidStateException("Queues model is not instance of Model\IQueues!");
-		}
-		return self::$queuesModel;
-	}
-
-
-	/**
-	 * Sets new queues model
-	 * @param IQueues $model
-	 */
-	public static function setQueuesModel(IQueues $model) {
-		self::$queuesModel = $model;
-		self::_doSetLifetime();
-	}
-
-
-	/**
-	 * @return Registrator
-	 */
-	public static function getUIRegistrator()
-	{
-		if (!self::$interfaceRegistrator instanceof Registrator) {
-			throw new InvalidStateException("Interface registrator is not instance of MultipleFileUpload\UI\Registrator!");
-		}
-		return self::$interfaceRegistrator;
-	}
-
-
-	public static function getHead()
-	{
-		// TODO: Add MFUFallbackController?
-
-		$out = "";
-		foreach (self::getUIRegistrator()->getInterfaces() AS $interface) {
-			$out .= $interface->renderHeadSection();
-		}
-		return $out;
-	}
-
-
-	/*	 * ****************************************************************************
-	 * *************************  Form Control  **************************************
-	 * ***************************************************************************** */
-	/**
-	 * Unique identifier
-	 * @var string
-	 */
-	public $token;
-
-	/**
-	 * Maximum selected files in one input
-	 * @var int
-	 */
-	public $maxFiles;
-
-	/**
-	 * Maximum file size of single uploaded file
-	 * @var int
-	 */
-	public $maxFileSize;
-
-	/**
-	 * How many threads will be used to upload files
-	 * @var int
-	 */
-	public $simUploadThreads;
-
-
-	/**
-	 * Constructor
-	 * @param string $label Label
-	 */
-	public function __construct($label = NULL, $maxSelectedFiles = 25)
-	{
-		parent::__construct($label);
-
-		if (!self::$handleUploadsCalled) {
-			throw new InvalidStateException("MultipleFileUpload::handleUpload() has not been called. Call `MultipleFileUpload::register();` from your bootstrap before you call Applicaton::run();");
-		};
-
-		$this->maxFiles = $maxSelectedFiles;
-		$this->control = Html::el("div"); // TODO: support for prototype
-		$this->maxFileSize = self::parseIniSize(ini_get('upload_max_filesize'));
-		$this->simUploadThreads = 5;
-	}
-
-
-	/**
-	 * Generates control
-	 * @return Html
-	 */
-	public function getControl()
-	{
-		$this->setOption('rendered', TRUE);
-
-		// Create control
-		$control = Html::el('div class=MultipleFileUpload')->id($this->getHtmlId());
-
-		// <section token field>
-		$tokenField = Html::el('input type=hidden')->name($this->getHtmlName() . '[token]')->value($this->getToken());
-		$control->add($tokenField);
-		// </section token field>
-
-		$fallbacks = array();
-
-		$interfaces = self::getUIRegistrator()->getInterfaces();
-		$num = count($interfaces);
-		$cnt = 1;
-		foreach ($interfaces AS $interface) {
-			$html = $interface->render($this);
-			// remove wrapping <script> tags
-			$init = Strings::replace($interface->renderInitJavaScript($this), '/\s*<\/?script>\s*/');
-			$desctruct = $interface->renderDestructJavaScript($this);
-			$id = $this->getHtmlId() . "-MFUInterface-" . Strings::webalize($interface->reflection->name);
-
-			$fallback = (object) array(
-					"id" => $id,
-					"init" => $init,
-					"destruct" => $desctruct
-			);
-			$fallbacks[] = $fallback;
-
-			$container = Html::el("div");
-			$container->setHtml($html);
-			$container->id = $id;
-
-			if ($cnt == $num) { // Last (will be rendered as JavaScript-disabled capable)
-				$container->style["display"] = "block";
-			} else {
-				$container->style["display"] = "none";
-			}
-			$cnt++;
-
-			$control->add($container);
-		}
-
-		$template = new UI\Template();
-		$template->setFile(dirname(__FILE__) . DIRECTORY_SEPARATOR . "RegisterJS.latte");
-		$template->id = $this->getHtmlId();
-		$template->fallbacks = $fallbacks;
-		$control->add($template->__toString(TRUE));
-		/*
-		  // <section without JavaScript>
-		  $withoutJS = Html::el("div class=withoutJS");
-		  $standardFileInput = Html::el("input type=file")
-		  ->name($this->getHtmlName() . '[files][]');
-		  $withoutJS->add($this->createSectionWithoutJS($standardFileInput));
-		  $control->add($withoutJS);
-		  // </section without JavaScript>
-		  // <section with JavaScript>
-		  $withJS = Html::el("div class=withJS");
-		  $uploadifyID = $this->getHtmlId() . "-uploadifyBox";
-		  $withJS->add($this->createSectionWithJS($uploadifyID, $this->getToken()));
-		  $control->add($withJS);
-		  // </section with JavaScript>
-		 */
-
-		// If handleUploads() already called -
-		/* if(self::$handleUploadsCheck){
-		  $control->add(Html::el('script type=text/javascript')->add(
-		  'jQuery("#' . $uploadifyID . '").uploadify(' . json_encode($this->uploaderOptions) . ');'
-		  ));
-		  }; */
-
-		return $control;
-	}
-
-
-	/**
-	 * Loads and process STANDARD http request. NOT uploadify requests!
-	 */
-	public function loadHttpData()
-	{
-		$name = $this->getHtmlName() . '[token]';
-		$data = $this->getForm()->getHttpData();
-
-		// Get queue token for received files
-		//  -> js & non-js as well (for js only the token is received)
-		if (!empty($data)) {
-			$token = Forms\Helpers::extractHttpData($data, $name, Forms\Form::DATA_LINE);
-			if ($token) {
-				$this->token = $token;
-			} else {
-				throw new InvalidStateException("Token has not been received! Without token MultipleFileUploader can't identify which files has been received.");
-			}
-		}
-	}
-
-
-	/**
-	 * Sets value
-	 * @param mixed $value
-	 */
-	public function setValue($value)
-	{
-		if ($value === null) {
-			// deleted automatically in destructor
-		} else {
-			throw new NotSupportedException('Value of MultiFileUpload component cannot be directly set.');
-		}
-	}
-
-
-	/**
-	 * Gets value
-	 * @return array
-	 */
-	public function getValue()
-	{
-		$data = $this->getQueue()->getFiles();
-
-		// Get only first <N> allowed files
-		// TODO: Implement as validation rule?
-		$pocetPolozek = count($data);
-		if ($pocetPolozek > $this->maxFiles) {
-			$rozdil = $pocetPolozek - $this->maxFiles;
-			for ($rozdil = $pocetPolozek - $this->maxFiles; $rozdil > 0; $rozdil--) {
-				array_pop($data);
-			}
-		}
-		return $data;
-	}
-
-
-	/**
-	 * Returns token
-	 * @return string|null
-	 */
-	public function getToken($need = true)
-	{
-		// Load token from request
-		if (!$this->token) {
-			$this->loadHttpData();
-		}
-
-		// If upload does not start, generate queueID
-		if (!$this->token and ! $this->form->isSubmitted()) {
-			$this->token = uniqid(rand());
-		}
-
-		if (!$this->token AND $need) {
-			throw new InvalidStateException("Can't get a token!");
-		}
-
-		return $this->token;
-	}
-
-
-	/**
-	 * Gets queue model
-	 * @return IQueue
-	 */
-	public function getQueue()
-	{
-		return self::getQueuesModel()->getQueue($this->getToken());
-	}
-
-
-	/**
-	 * Destructors: makes fast cleanup
-	 */
-	public function __destruct()
-	{
-		if ($this->getForm()->isSubmitted()) {
-			// comment out if you want to keep files after form submission as well, for cases of server errors so F5 can be used to refresh
-			$this->getQueue()->delete();
-		}
-	}
-
-
-	/*	 * ****************************************************************************
-	 * ***************************  Validators  **************************************
-	 * ***************************************************************************** */
-
-	/**
-	 * Filled validator: has been any file uploaded?
-	 * @param Forms\IControl
-	 * @return bool
-	 */
-	public static function validateFilled(Forms\IControl $control)
-	{
-		$files = $control->getValue();
-		return (count($files) > 0);
-	}
-
-
-	/**
-	 * FileSize validator: is file size in limit?
-	 * @param  Forms\Controls\UploadControl
-	 * @param  int  file size limit
-	 * @return bool
-	 */
-	public static function validateFileSize(Forms\Controls\UploadControl $control, $limit)
-	{
-		$files = $control->getValue();
-		$size = 0;
-		foreach ($files AS $file) {
-			$size += $file->getSize();
-		}
-		return $size <= $limit;
-	}
-
-
-	/**
-	 * MimeType validator: has file specified mime type?
-	 * @param  FileUpload
-	 * @param  array|string  mime type
-	 * @return bool
-	 */
-	public static function validateMimeType(Forms\Controls\UploadControl $control, $mimeType)
-	{
-		throw new NotSupportedException("Can't validate mime type! This is MULTIPLE file upload control.");
-	}
-
-
-	/*	 * ******************* Helpers ******************** */
-
-	/**
-	 * Parses ini size
-	 * @param string $value
-	 * @return int
-	 */
-	public static function parseIniSize($value)
-	{
-		$units = array('k' => 1024, 'm' => 1048576, 'g' => 1073741824);
-
-		$unit = strtolower(substr($value, -1));
-
-		if (is_numeric($unit) || !isset($units[$unit]))
-			return $value;
-
-		return ((int) $value) * $units[$unit];
-	}
-
-
-}
-
-/**
- * Extension method for FormContainer
- */
-function FormContainer_addMultipleFileUpload(Forms\Container $_this, $name, $label = NULL, $maxFiles = 25)
-{
-	return $_this[$name] = new MultipleFileUpload($label, $maxFiles);
-}
-
-
-Container::extensionMethod("\Nette\Forms\Container::addMultipleFileUpload", "MultipleFileUpload\FormContainer_addMultipleFileUpload");
+<?php
+
+/**
+ * MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
+ *
+ * Copyright (c) 2014 Jan Kuchař (https://github.com/jkuchar), Ciki (https://github.com/Ciki)
+ * and contributors https://github.com/jkuchar/MultipleFileUpload/graphs/contributors
+ *
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ */
+
+namespace MultipleFileUpload;
+
+use MultipleFileUpload\Model\IQueue,
+	MultipleFileUpload\Model\IQueues,
+	MultipleFileUpload\UI\Registrator,
+	Latte,
+	Nette,
+	Nette\Bridges,
+	Nette\Forms,
+	Nette\Forms\Container,
+	Nette\Forms\Controls\UploadControl,
+	Nette\Http\FileUpload,
+	Nette\InvalidStateException,
+	Nette\NotSupportedException,
+	Nette\Utils\Html,
+	Nette\Utils\Strings;
+
+class MultipleFileUpload extends UploadControl
+{
+	/**
+	 * Is files handle uploads called?
+	 * @var bool
+	 * @see self::handleUploads()
+	 */
+	private static $handleUploadsCalled = false;
+
+	/**
+	 * Model
+	 * @var IQueues
+	 * @see self::init()
+	 */
+	protected static $queuesModel;
+
+	/**
+	 * Validate file callback
+	 * @var Callback
+	 * @return bool
+	 * @param FileUpload File to be checked
+	 */
+	public static $validateFileCallback;
+
+	/**
+	 * Interface registrator instance
+	 * @var Registrator
+	 */
+	public static $interfaceRegistrator;
+
+	/**
+	 * Root of mfu directory in public folder (used for serving js, css, ...)
+	 * @var string
+	 */
+	public static $baseWWWRoot = null;
+
+	/** @var Nette\Http\IRequest */
+	private static $request;
+
+
+	/**
+	 * Initialize MFU uploads handling and cache cleanups
+	 * For form control initialization {@see self::__contruct()}.
+	 */
+	public static function init(Model\IQueues $queuesModel, Nette\Http\IRequest $request, UI\Registrator $registrator)
+	{
+		self::$queuesModel = $queuesModel;
+		self::$request = $request;
+		self::$interfaceRegistrator = $registrator;
+
+		// Set default check callback
+		self::$validateFileCallback = [__CLASS__, "validateFile"];
+		self::$baseWWWRoot = self::$request->url->baseUrl . "MultipleFileUpload/";
+	}
+
+
+	/* ##########  HANDLING UPLOADS  ########### */
+
+	/**
+	 * Sets life time of files in queue (shortcut for self::getQueuesModel()->setLifeTime)
+	 * @param int $lifeTime Time in seconds
+	 */
+	static function setLifeTime($lifeTime)
+	{
+		self::getQueuesModel()
+			->setLifeTime((int) $lifeTime);
+	}
+
+
+	protected static function _doSetLifetime()
+	{
+		// Auto config of lifeTime
+		$maxInputTime = (int) ini_get("max_input_time");
+		// default if no max input time defined (-1)
+		if ($maxInputTime < 0) {
+			$lifeTime = 3600;
+		} else {
+			$lifeTime = $maxInputTime + 5;
+		}
+
+		self::setLifeTime($lifeTime);
+	}
+
+
+	/**
+	 * Handles uploading files
+	 */
+	public static function handleUploads()
+	{
+		if (self::$handleUploadsCalled === true) {
+			return;
+		} else {
+			self::$handleUploadsCalled = true;
+		}
+		
+		$request = self::$request;
+		// Workaround for: http://forum.nettephp.com/cs/3680-httprequest-getheaders-a-content-type
+		$contentType = $request->getHeader("content-type");
+		if (!$contentType and isset($_SERVER["CONTENT_TYPE"])) {
+			$contentType = $_SERVER["CONTENT_TYPE"];
+		}
+
+		if ($request->getMethod() !== "POST") {
+			return;
+		}
+
+		self::getQueuesModel()->initialize();
+
+		foreach (self::getUIRegistrator()->getInterfaces(self::$request) AS $interface) {
+//			\Nette\Diagnostics\Debugger::log($interface->getReflection()->getName().": is this your upload? ".$interface->isThisYourUpload());
+			if ($interface->isThisYourUpload()) {
+				$ret = $interface->handleUploads();
+				if ($ret === true)
+					break;
+			}
+		}
+	}
+
+
+	/**
+	 * Checks file if is ok and can be processed
+	 * @param FileUpload $file
+	 * @return bool
+	 */
+	public static function validateFile(FileUpload $file)
+	{
+		return $file->isOk();
+	}
+
+
+	/**
+	 * Cleans cache
+	 */
+	public static function cleanCache()
+	{
+		if (false == self::getUIRegistrator()->getProductionMode() or rand(1, 100) < 5) {
+			self::getQueuesModel()->cleanup();
+		}
+	}
+
+
+	/**
+	 * @return IQueues
+	 * @throws InvalidStateException
+	 */
+	public static function getQueuesModel()
+	{
+		if (!self::$queuesModel instanceof IQueues) {
+			throw new InvalidStateException("Queues model was not set or is not instance of Model\IQueues!");
+		}
+		return self::$queuesModel;
+	}
+
+
+	/**
+	 * Sets new queues model
+	 * @param IQueues $model
+	 */
+	public static function setQueuesModel(IQueues $model) {
+		self::$queuesModel = $model;
+		self::_doSetLifetime();
+	}
+
+
+
+	/**
+	 * @return Registrator
+	 */
+	public static function getUIRegistrator()
+	{
+		if (!self::$interfaceRegistrator instanceof Registrator) {
+			throw new InvalidStateException("Interface registrator is not instance of MultipleFileUpload\\UI\\Registrator!");
+		}
+		return self::$interfaceRegistrator;
+	}
+
+
+	public static function getHead()
+	{
+		$out = "";
+		foreach ($this->interfaces AS $interface) {
+			$out .= $interface->renderHeadSection();
+		}
+		return $out;
+	}
+
+
+	/*	 * ****************************************************************************
+	 * *************************  Form Control  **************************************
+	 * ***************************************************************************** */
+	/**
+	 * Unique identifier
+	 * @var string
+	 */
+	public $token;
+
+	/**
+	 * Maximum selected files in one input
+	 * @var int
+	 */
+	public $maxFiles;
+
+	/**
+	 * Maximum file size of single uploaded file
+	 * @var int
+	 */
+	public $maxFileSize;
+
+	/**
+	 * How many threads will be used to upload files
+	 * @var int
+	 */
+	public $simUploadThreads;
+
+	/**
+	 * Constructor
+	 * @param string $label Label
+	 */
+	public function __construct($label = NULL, $maxSelectedFiles = 25, Nette\Http\IRequest $request, UI\Registrator $registrator)
+	{
+		parent::__construct($label);
+		if (!self::$handleUploadsCalled) {
+			throw new InvalidStateException("MultipleFileUpload::handleUpload() has not been called. Call `MultipleFileUpload::register();` from your bootstrap before you call Applicaton::run();");
+		};
+		
+		$this->maxFiles = $maxSelectedFiles;
+		$this->control = Html::el("div"); // TODO: support for prototype
+		$this->maxFileSize = self::parseIniSize(ini_get('upload_max_filesize'));
+		$this->simUploadThreads = 5;
+		// Set default check callback
+		self::$request = $request;
+		self::$interfaceRegistrator = $registrator;
+		self::$validateFileCallback = [__CLASS__, "validateFile"];
+		self::$baseWWWRoot = self::$request->url->baseUrl . "MultipleFileUpload/";
+	}
+
+
+	/**
+	 * Generates control
+	 * @return Html
+	 */
+	public function getControl()
+	{
+		$this->setOption('rendered', TRUE);
+
+		// Create control
+		$control = Html::el('div class=MultipleFileUpload')->id($this->getHtmlId());
+
+		// <section token field>
+		$tokenField = Html::el('input type=hidden')->name($this->getHtmlName() . '[token]')->value($this->getToken());
+		$control->addHtml($tokenField);
+		// </section token field>
+
+		$fallbacks = array();
+		$interfaces = self::getUIRegistrator()->getInterfaces(self::$request);
+		$num = count($interfaces);
+		$cnt = 1;
+		foreach ($interfaces AS $interface) {
+			$html = $interface->render($this);
+			// remove wrapping <script> tags
+			$init = Strings::replace($interface->renderInitJavaScript($this), '/\s*<\/?script>\s*/');
+			$desctruct = $interface->renderDestructJavaScript($this);
+			$id = $this->getHtmlId() . "-MFUInterface-" . Strings::webalize($interface->reflection->name);
+
+			$fallback = (object) array(
+					"id" => $id,
+					"init" => $init,
+					"destruct" => $desctruct
+			);
+			$fallbacks[] = $fallback;
+
+			$container = Html::el("div");
+			$container->setHtml($html);
+			$container->id = $id;
+
+			if ($cnt == $num) { // Last (will be rendered as JavaScript-disabled capable)
+				$container->style["display"] = "block";
+			} else {
+				$container->style["display"] = "none";
+			}
+			$cnt++;
+
+			$control->addHtml($container);
+		}
+
+			$latte = new Latte\Engine();
+			$template = new Bridges\ApplicationLatte\Template($latte);
+			$template->setFile(__DIR__ . DIRECTORY_SEPARATOR . "RegisterJS.latte");
+			$template->id = $this->getHtmlId();
+			$template->fallbacks = $fallbacks;
+			$control->addHtml($template->__toString(TRUE));
+		/*
+		  // <section without JavaScript>
+		  $withoutJS = Html::el("div class=withoutJS");
+		  $standardFileInput = Html::el("input type=file")
+		  ->name($this->getHtmlName() . '[files][]');
+		  $withoutJS->add($this->createSectionWithoutJS($standardFileInput));
+		  $control->add($withoutJS);
+		  // </section without JavaScript>
+		  // <section with JavaScript>
+		  $withJS = Html::el("div class=withJS");
+		  $uploadifyID = $this->getHtmlId() . "-uploadifyBox";
+		  $withJS->add($this->createSectionWithJS($uploadifyID, $this->getToken()));
+		  $control->add($withJS);
+		  // </section with JavaScript>
+		 */
+
+		// If handleUploads() already called -
+		/* if(self::$handleUploadsCheck){
+		  $control->add(Html::el('script type=text/javascript')->add(
+		  'jQuery("#' . $uploadifyID . '").uploadify(' . json_encode($this->uploaderOptions) . ');'
+		  ));
+		  }; */
+
+		return $control;
+	}
+
+
+	/**
+	 * Loads and process STANDARD http request. NOT uploadify requests!
+	 */
+	public function loadHttpData()
+	{
+		$name = $this->getHtmlName() . '[token]';
+		$data = $this->getForm()->getHttpData();
+
+		// Get queue token for received files
+		//  -> js & non-js as well (for js only the token is received)
+		if (!empty($data)) {
+			$token = Forms\Helpers::extractHttpData($data, $name, Forms\Form::DATA_LINE);
+			if ($token) {
+				$this->token = $token;
+			} else {
+				throw new InvalidStateException("Token has not been received! Without token MultipleFileUploader can't identify which files has been received.");
+			}
+		}
+	}
+
+
+	/**
+	 * Sets value
+	 * @param mixed $value
+	 */
+	public function setValue($value)
+	{
+		if ($value === null) {
+			// deleted automatically in destructor
+		} else {
+			throw new NotSupportedException('Value of MultiFileUpload component cannot be directly set.');
+		}
+	}
+
+
+	/**
+	 * Gets value
+	 * @return array
+	 */
+	public function getValue()
+	{
+		$data = $this->getQueue()->getFiles();
+
+		// Get only first <N> allowed files
+		// TODO: Implement as validation rule?
+		$pocetPolozek = count($data);
+		if ($pocetPolozek > $this->maxFiles) {
+			$rozdil = $pocetPolozek - $this->maxFiles;
+			for ($rozdil = $pocetPolozek - $this->maxFiles; $rozdil > 0; $rozdil--) {
+				array_pop($data);
+			}
+		}
+		return $data;
+	}
+
+
+	/**
+	 * Returns token
+	 * @return string|null
+	 */
+	public function getToken($need = true)
+	{
+		// Load token from request
+		if (!$this->token) {
+			$this->loadHttpData();
+		}
+
+		// If upload does not start, generate queueID
+		if (!$this->token and ! $this->form->isSubmitted()) {
+			$this->token = uniqid(rand());
+		}
+
+		if (!$this->token AND $need) {
+			throw new InvalidStateException("Can't get a token!");
+		}
+
+		return $this->token;
+	}
+
+
+	/**
+	 * Gets queue model
+	 * @return IQueue
+	 */
+	public function getQueue()
+	{
+		return self::getQueuesModel()->getQueue($this->getToken());
+	}
+
+
+	/**
+	 * Destructors: makes fast cleanup
+	 */
+	public function __destruct()
+	{
+		if ($this->getForm()->isSubmitted()) {
+			// comment out if you want to keep files after form submission as well, for cases of server errors so F5 can be used to refresh
+			$this->getQueue()->delete();
+		}
+	}
+
+
+	/*	 * ****************************************************************************
+	 * ***************************  Validators  **************************************
+	 * ***************************************************************************** */
+
+	/**
+	 * Filled validator: has been any file uploaded?
+	 * @param Forms\IControl
+	 * @return bool
+	 */
+	public static function validateFilled(Forms\IControl $control)
+	{
+		$files = $control->getValue();
+		return (count($files) > 0);
+	}
+
+
+	/**
+	 * FileSize validator: is file size in limit?
+	 * @param  Forms\Controls\UploadControl
+	 * @param  int  file size limit
+	 * @return bool
+	 */
+	public static function validateFileSize(Forms\Controls\UploadControl $control, $limit)
+	{
+		$files = $control->getValue();
+		$size = 0;
+		foreach ($files AS $file) {
+			$size += $file->getSize();
+		}
+		return $size <= $limit;
+	}
+
+
+	/**
+	 * MimeType validator: has file specified mime type?
+	 * @param  FileUpload
+	 * @param  array|string  mime type
+	 * @return bool
+	 */
+	public static function validateMimeType(Forms\Controls\UploadControl $control, $mimeType)
+	{
+		throw new NotSupportedException("Can't validate mime type! This is MULTIPLE file upload control.");
+	}
+
+
+	/*	 * ******************* Helpers ******************** */
+
+	/**
+	 * Parses ini size
+	 * @param string $value
+	 * @return int
+	 */
+	public static function parseIniSize($value)
+	{
+		$units = array('k' => 1024, 'm' => 1048576, 'g' => 1073741824);
+
+		$unit = strtolower(substr($value, -1));
+
+		if (is_numeric($unit) || !isset($units[$unit]))
+			return $value;
+
+		return ((int) $value) * $units[$unit];
+	}
+
+
+}
+
+/**
+ * Extension method for FormContainer
+
+function FormContainer_addMultipleFileUpload(Forms\Container $_this, $name, $label = NULL, $maxFiles = 25)
+{
+	return $_this[$name] = new MultipleFileUpload($label, $maxFiles);
+}
+
+
+Container::extensionMethod("\Nette\Forms\Container::addMultipleFileUpload", "MultipleFileUpload\FormContainer_addMultipleFileUpload");
+ */
diff --git a/MultipleFileUpload/UI/AbstractInterface.php b/MultipleFileUpload/UI/AbstractInterface.php
index dca6bdf..3d8aaa4 100644
--- a/MultipleFileUpload/UI/AbstractInterface.php
+++ b/MultipleFileUpload/UI/AbstractInterface.php
@@ -12,11 +12,11 @@
 namespace MultipleFileUpload\UI;
 
 use MultipleFileUpload\MultipleFileUpload,
-	Nette\Environment,
+	Latte,
+	Nette\Bridges,
 	Nette\Http\FileUpload,
 	Nette\Http\Request,
-	Nette\Object,
-	Nette\Utils\Callback;
+	Nette\Object;
 
 /**
  * Abstract UI Controller
@@ -27,9 +27,9 @@ abstract class AbstractInterface extends Object implements IUserInterface
 	protected $httpRequest;
 
 
-	public function __construct()
+	public function __construct(Request $httpRequest)
 	{
-		$this->httpRequest = Environment::getHttpRequest();
+		$this->httpRequest = $httpRequest;
 	}
 
 
@@ -72,18 +72,14 @@ function processFile($token, $file)
 	}
 
 
-	/**
-	 * @return Template
-	 */
-	protected function createTemplate($file = null)
+	protected function createTemplate()
 	{
-		$template = new Template($file);
-
+		$latte = new Latte\Engine();
+		$template = new Bridges\ApplicationLatte\Template($latte);
 		$template->baseUrl = $this->httpRequest->url->baseUrl;
 		$template->basePath = rtrim($template->baseUrl, '/');
 		$template->interface = $this;
-
-		$template->registerHelperLoader('Nette\Templating\Helpers::loader');
+		$template->addFilter(NULL, 'Latte\Macros\CoreMacros::install');
 
 		return $template;
 	}
diff --git a/MultipleFileUpload/UI/HTML4SingleUpload/Controller.php b/MultipleFileUpload/UI/HTML4SingleUpload/Controller.php
index 45be20f..53db45c 100644
--- a/MultipleFileUpload/UI/HTML4SingleUpload/Controller.php
+++ b/MultipleFileUpload/UI/HTML4SingleUpload/Controller.php
@@ -89,7 +89,8 @@ public function handleUploads()
 	 */
 	public function render(MultipleFileUpload $upload)
 	{
-		$template = $this->createTemplate(dirname(__FILE__) . "/html.latte");
+		$template = parent::createTemplate();
+		$template->setFile(__DIR__ . "/html.latte");
 		$template->maxFiles = $upload->maxFiles;
 		$template->mfu = $upload;
 		return $template->__toString(TRUE);
@@ -101,7 +102,8 @@ public function render(MultipleFileUpload $upload)
 	 */
 	public function renderInitJavaScript(MultipleFileUpload $upload)
 	{
-		return $this->createTemplate(dirname(__FILE__) . "/initJS.latte")->__toString(TRUE);
+        $template = parent::createTemplate();
+		return $template->setFile(__DIR__ . "/initJS.latte")->__toString(TRUE);
 	}
 
 
diff --git a/MultipleFileUpload/UI/HTML4SingleUpload/html.latte b/MultipleFileUpload/UI/HTML4SingleUpload/html.latte
index f0e6e64..b89bf42 100755
--- a/MultipleFileUpload/UI/HTML4SingleUpload/html.latte
+++ b/MultipleFileUpload/UI/HTML4SingleUpload/html.latte
@@ -34,7 +34,7 @@
 * @link       http://nettephp.com/cs/extras/multiplefileupload
 *}
 
-{?
+{php
 $input =  \Nette\Utils\Html::el("input type=file")->name($mfu->getHtmlName().'[files][]');
 }
 
diff --git a/MultipleFileUpload/UI/Plupload/Controller.php b/MultipleFileUpload/UI/Plupload/Controller.php
index ce15a7f..07f025c 100644
--- a/MultipleFileUpload/UI/Plupload/Controller.php
+++ b/MultipleFileUpload/UI/Plupload/Controller.php
@@ -13,7 +13,9 @@
 
 use MultipleFileUpload\MultipleFileUpload,
 	MultipleFileUpload\UI\AbstractInterface,
-	Nette\Http\FileUpload;
+	Nette\DI\Container,
+	Nette\Http\FileUpload,
+	Nette\Http\Request;
 
 /**
  * @author Jan Kuchař
@@ -21,6 +23,17 @@
 class Controller extends AbstractInterface
 {
 
+
+	/** @var Array */
+	private $parameters;
+
+
+	public function __construct(Container $container, Request $httpRequest)
+	{
+		parent::__construct($httpRequest);
+		$this->parameters = $container->getParameters();
+	}
+
 	/**
 	 * Gets interface base url
 	 * @return type string
@@ -221,27 +234,31 @@ function getHtmlIdFlashCompatible(MultipleFileUpload $upload)
 	 */
 	public function render(MultipleFileUpload $upload)
 	{
-		$template = $this->createTemplate(dirname(__FILE__) . "/html.latte");
-		$template->id = $this->getHtmlIdFlashCompatible($upload);
-		return $template->__toString(TRUE);
+	$template = parent::createTemplate();
+	$template->setFile(__DIR__ . "/html.latte");
+	$template->id = $this->getHtmlIdFlashCompatible($upload);
+	return $template->__toString(TRUE);
 	}
 
 
-	/**
+	/**}}
 	 * Renders JavaScript body of function.
 	 */
 	public function renderInitJavaScript(MultipleFileUpload $upload)
 	{
-		$tpl = $this->createTemplate(dirname(__FILE__) . "/initJS.latte");
-		$tpl->token = $upload->getToken();
-		$tpl->sizeLimit = $upload->maxFileSize;
-		$tpl->maxFiles = $upload->maxFiles;
+	$template = parent::createTemplate();
+	$template->setFile(__DIR__ . "/initJS.latte");
+	$template->token = $upload->getToken();
+	$template->sizeLimit = $upload->maxFileSize;
+	$template->maxFiles = $upload->maxFiles;
 
 		// TODO: make creation of link nicer!
-		$baseUrl = $this->httpRequest->url->baseUrl;
-		$tpl->uploadLink = $baseUrl . "?token=" . $tpl->token . "&uploader=plupload";
-		$tpl->id = $this->getHtmlIdFlashCompatible($upload);
-		return $tpl->__toString(TRUE);
+		//$baseUrl = $this->httpRequest->url->baseUrl;
+		//$template->uploadLink = $baseUrl . "?token=" . $template->token . "&uploader=plupload";
+	$url = $this->httpRequest->url;
+	$template->uploadLink = $url->scheme . "://" . $url->host . $url->path . '?' . $url->query . "&token=" . $template->token . "&uploader=plupload";
+		$template->id = $this->getHtmlIdFlashCompatible($upload);
+		return $template->__toString(TRUE);
 	}
 
 
@@ -250,7 +267,8 @@ public function renderInitJavaScript(MultipleFileUpload $upload)
 	 */
 	public function renderDestructJavaScript(MultipleFileUpload $upload)
 	{
-		return $this->createTemplate(dirname(__FILE__) . "/destructJS.js")->__toString(TRUE);
+	$template = parent::createTemplate();
+	$template->setFile(__DIR__ . "/destructJS.js")->__toString(TRUE);
 	}
 
 
@@ -259,7 +277,9 @@ public function renderDestructJavaScript(MultipleFileUpload $upload)
 	 */
 	public function renderHeadSection()
 	{
-		return $this->createTemplate(dirname(__FILE__) . "/head.latte")->__toString(TRUE);
+	$template = parent::createTemplate();
+	$template->productionMode = $this->parameters['productionMode'];
+	$template->setFile(__DIR__ . "/head.latte")->__toString(TRUE);
 	}
 
 
diff --git a/MultipleFileUpload/UI/Plupload/head.latte b/MultipleFileUpload/UI/Plupload/head.latte
index 1b51516..ba7df9b 100644
--- a/MultipleFileUpload/UI/Plupload/head.latte
+++ b/MultipleFileUpload/UI/Plupload/head.latte
@@ -2,7 +2,7 @@
 <link href="{$interface->baseUrl}/js/jquery.plupload.queue/css/jquery.plupload.queue.css" rel="stylesheet" type="text/css" />
 
 <!-- Load plupload and all it's runtimes and finally the jQuery UI queue widget -->
-{if \Nette\Environment::isProduction()}
+{if true == $productionMode}
 <script type="text/javascript" src="{$interface->baseUrl}/js/plupload.full.min.js"></script>
 <script type="text/javascript" src="{$interface->baseUrl}/js/jquery.plupload.queue/jquery.plupload.queue.min.js"></script>
 {else}
diff --git a/MultipleFileUpload/UI/Registrator.php b/MultipleFileUpload/UI/Registrator.php
index dafe9f9..25c3141 100644
--- a/MultipleFileUpload/UI/Registrator.php
+++ b/MultipleFileUpload/UI/Registrator.php
@@ -1,65 +1,82 @@
-<?php
-
-/**
- * This file is part of the MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
- *
- * Copyright (c) 2013 Jan Kuchař (http://www.jankuchar.cz)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- */
-
-namespace MultipleFileUpload\UI;
-
-use Nette\InvalidArgumentException,
-	Nette\Object;
-
-/**
- * Registrator of user interfaces used to set priorities of interfaces
- */
-class Registrator extends Object
-{
-	public $interfaces = array();
-
-
-	public function register($interface)
-	{
-		if (is_object($interface)) {
-			if (!$interface instanceof IUserInterface) {
-				throw new InvalidArgumentException("Interface must implement MultipleFileUpload\UI\IUserInterface!");
-			}
-			$this->interfaces[] = $interface;
-		} elseif (is_string($interface)) {
-			// User gives us only namespace
-			$this->interfaces[] = $interface . "\\Controller";
-		} else {
-			throw new InvalidArgumentException("Not supported interface!");
-		}
-		return $this;
-	}
-
-
-	public function clear()
-	{
-		$this->interfaces = array();
-		return $this;
-	}
-
-
-	public function getInterfaces()
-	{
-		$interfaces = $this->interfaces;
-		foreach ($interfaces AS $key => $interface) {
-			if (is_string($interface)) {
-				$interface = $interfaces[$key] = new $interface;
-			}
-			if (!$interface instanceof IUserInterface) {
-				throw new InvalidArgumentException($interface->reflection->name . " is not compatible with MFU!");
-			}
-		}
-		$this->interfaces = $interfaces;
-		return array_reverse($interfaces);
-	}
-
-
+<?php
+
+/**
+ * This file is part of the MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
+ *
+ * Copyright (c) 2013 Jan Kuchař (http://www.jankuchar.cz)
+ *
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ */
+
+namespace MultipleFileUpload\UI;
+
+use Nette\InvalidArgumentException,
+	Nette\Http\Request,
+	Nette\Object;
+
+/**
+ * Registrator of user interfaces used to set priorities of interfaces
+ */
+class Registrator extends Object
+{
+	public $interfaces = array();
+
+
+	private $productionMode;
+
+
+	public function __construct($productionMode, HTML4SingleUpload\Controller $htmlUpload, Plupload\Controller $plupload)
+	{
+		$this->productionMode = $productionMode;
+		$this->interfaces[] = $htmlUpload;
+		$this->interfaces[] = $plupload;
+	}
+
+
+	public function getProductionMode() {
+		return $this->productionMode;
+	}
+
+
+	public function register($interface)
+	{
+		if (is_object($interface)) {
+			if (!$interface instanceof IUserInterface) {
+				throw new InvalidArgumentException("Interface must implement MultipleFileUpload\UI\IUserInterface!");
+			}
+			$this->interfaces[] = $interface;
+		} elseif (is_string($interface)) {
+			// User gives us only namespace
+			$this->interfaces[] = $interface . "\\Controller";
+		} else {
+			throw new InvalidArgumentException("Not supported interface!");
+		}
+		return $this;
+	}
+
+
+	public function clear()
+	{
+		$this->interfaces = array();
+		return $this;
+	}
+
+
+	public function getInterfaces(Request $request)
+	{
+		$interfaces = $this->interfaces;
+		foreach ($interfaces AS $key => $interface) {
+			if (is_string($interface)) {
+				$interface = $interfaces[$key] = new $interface($request);
+			}
+			if (!$interface instanceof IUserInterface) {
+				throw new InvalidArgumentException($interface->reflection->name . " is not compatible with MFU!");
+			}
+		}
+		$this->interfaces = $interfaces;
+		return array_reverse($interfaces);
+	}
+
+
 }
\ No newline at end of file
diff --git a/MultipleFileUpload/UI/Swfupload/Controller.php b/MultipleFileUpload/UI/Swfupload/Controller.php
index cb8bac2..f9b6908 100644
--- a/MultipleFileUpload/UI/Swfupload/Controller.php
+++ b/MultipleFileUpload/UI/Swfupload/Controller.php
@@ -1,113 +1,116 @@
-<?php
-
-/**
- * This file is part of the MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
- *
- * Copyright (c) 2013 Roman Vykuka (http://forum.nette.org/cs/profile.php?id=2221)
- * Copyright (c) 2013 Jan Kuchař (http://www.jankuchar.cz)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
- */
-
-namespace MultipleFileUpload\UI\Swfupload;
-
-use MultipleFileUpload\MultipleFileUpload,
-	MultipleFileUpload\UI\AbstractInterface,
-	Nette\Http\FileUpload;
-
-/**
- * @author Roman Vykuka, Jan Kuchař
- */
-class Controller extends AbstractInterface
-{
-
-	/**
-	 * Gets interface base url
-	 * @return type string
-	 */
-	function getBaseUrl()
-	{
-		return parent::getBaseUrl() . "swfupload";
-	}
-
-
-	/**
-	 * Is this upload your upload? (upload from this interface)
-	 */
-	public function isThisYourUpload()
-	{
-		return $this->httpRequest->getPost('sender') === "MFU-Swfupload";
-	}
-
-
-	/**
-	 * Handles uploaded files
-	 * forwards it to model
-	 */
-	public function handleUploads()
-	{
-		$token = $this->httpRequest->getPost('token');
-		if (!$token) {
-			return;
-		}
-
-		/* @var $file FileUpload */
-		foreach ($this->httpRequest->getFiles() AS $file) {
-			self::processFile($token, $file);
-		}
-
-		// Response to client
-		echo "1";
-
-		// End the script
-		exit;
-	}
-
-
-	/**
-	 * Renders interface to <div>
-	 */
-	public function render(MultipleFileUpload $upload)
-	{
-		$template = $this->createTemplate(dirname(__FILE__) . "/html.latte");
-		$template->swfuId = $upload->getHtmlId() . "-swfuBox";
-		return $template->__toString(TRUE);
-	}
-
-
-	/**
-	 * Renders JavaScript body of function.
-	 */
-	public function renderInitJavaScript(MultipleFileUpload $upload)
-	{
-		$tpl = $this->createTemplate(dirname(__FILE__) . "/initJS.latte");
-		$tpl->sizeLimit = ini_get('upload_max_filesize') . 'B';
-		$tpl->token = $upload->getToken();
-		$tpl->maxFiles = $upload->maxFiles;
-		$tpl->backLink = (string) $upload->form->action;
-		$tpl->swfuId = $upload->getHtmlId() . "-swfuBox";
-		$tpl->simUploadFiles = $upload->simUploadThreads;
-		return $tpl->__toString(TRUE);
-	}
-
-
-	/**
-	 * Renders JavaScript body of function.
-	 */
-	public function renderDestructJavaScript(MultipleFileUpload $upload)
-	{
-		return $this->createTemplate(dirname(__FILE__) . "/destructJS.js")->__toString(TRUE);
-	}
-
-
-	/**
-	 * Renders set-up tags to <head> attribute
-	 */
-	public function renderHeadSection()
-	{
-		return $this->createTemplate(dirname(__FILE__) . "/head.latte")->__toString(TRUE);
-	}
-
-
+<?php
+
+/**
+ * This file is part of the MultipleFileUpload (https://github.com/jkuchar/MultipleFileUpload/)
+ *
+ * Copyright (c) 2013 Roman Vykuka (http://forum.nette.org/cs/profile.php?id=2221)
+ * Copyright (c) 2013 Jan Kuchař (http://www.jankuchar.cz)
+ *
+ * For the full copyright and license information, please view
+ * the file license.txt that was distributed with this source code.
+ */
+
+namespace MultipleFileUpload\UI\Swfupload;
+
+use MultipleFileUpload\MultipleFileUpload,
+	MultipleFileUpload\UI\AbstractInterface,
+	Nette\Http\FileUpload;
+
+/**
+ * @author Roman Vykuka, Jan Kuchař
+ */
+class Controller extends AbstractInterface
+{
+
+	/**
+	 * Gets interface base url
+	 * @return type string
+	 */
+	function getBaseUrl()
+	{
+		return parent::getBaseUrl() . "swfupload";
+	}
+
+
+	/**
+	 * Is this upload your upload? (upload from this interface)
+	 */
+	public function isThisYourUpload()
+	{
+		return $this->httpRequest->getPost('sender') === "MFU-Swfupload";
+	}
+
+
+	/**
+	 * Handles uploaded files
+	 * forwards it to model
+	 */
+	public function handleUploads()
+	{
+		$token = $this->httpRequest->getPost('token');
+		if (!$token) {
+			return;
+		}
+
+		/* @var $file FileUpload */
+		foreach ($this->httpRequest->getFiles() AS $file) {
+			self::processFile($token, $file);
+		}
+
+		// Response to client
+		echo "1";
+
+		// End the script
+		exit;
+	}
+
+
+	/**
+	 * Renders interface to <div>
+	 */
+	public function render(MultipleFileUpload $upload)
+	{
+		$template = $this->createTemplate(dirname(__FILE__) . "/html.latte");
+		$template->swfuId = $upload->getHtmlId() . "-swfuBox";
+		return $template->__toString(TRUE);
+	}
+
+
+	/**
+	 * Renders JavaScript body of function.
+	 */
+	public function renderInitJavaScript(MultipleFileUpload $upload)
+	{
+		$template = $this->createTemplate(dirname(__FILE__) . "/initJS.latte");
+		$template->sizeLimit = ini_get('upload_max_filesize') . 'B';
+		$template->token = $upload->getToken();
+		$template->maxFiles = $upload->maxFiles;
+		$template->backLink = (string) $upload->form->action;
+		$template->swfuId = $upload->getHtmlId() . "-swfuBox";
+		$template->simUploadFiles = $upload->simUploadThreads;
+		$template->flash_url = $this->httpRequest->url->baseUrl . '/swf/swfupload.swf';
+		$template->flash9_url = $this->httpRequest->url->baseUrl . '/swf/swfupload_fp9.swf';
+		$template->button_image_url = $this->httpRequest->url->baseUrl . 'imgs/XPButtonUploadText_89x88.png';
+		return $template->__toString(TRUE);
+	}
+
+
+	/**
+	 * Renders JavaScript body of function.
+	 */
+	public function renderDestructJavaScript(MultipleFileUpload $upload)
+	{
+		return $this->createTemplate(dirname(__FILE__) . "/destructJS.js")->__toString(TRUE);
+	}
+
+
+	/**
+	 * Renders set-up tags to <head> attribute
+	 */
+	public function renderHeadSection()
+	{
+		return $this->createTemplate(dirname(__FILE__) . "/head.latte")->__toString(TRUE);
+	}
+
+
 }
\ No newline at end of file
diff --git a/MultipleFileUpload/UI/Swfupload/initJS.latte b/MultipleFileUpload/UI/Swfupload/initJS.latte
index dd3d1f4..eb48263 100644
--- a/MultipleFileUpload/UI/Swfupload/initJS.latte
+++ b/MultipleFileUpload/UI/Swfupload/initJS.latte
@@ -1,34 +1,34 @@
-<script>
-(function($){
-
-    $("#{$swfuId|noescape}").swfupload({
-            flash_url : {=\Nette\Environment::expand("{$interface->baseUrl}/swf/swfupload.swf")|escapeJS|noescape},
-            flash9_url : {=\Nette\Environment::expand("{$interface->baseUrl}/swf/swfupload_fp9.swf")|escapeJS|noescape},
-            upload_url: {$backLink|escapeJS|noescape},
-            post_params: {
-                token : {$token|escapeJS|noescape},
-                sender: "MFU-Swfupload"
-            },
-
-            file_size_limit : {$sizeLimit|escapeJS|noescape},
-            file_types : "*.*",
-            file_types_description : "All Files",
-            file_upload_limit : {$maxFiles|escapeJS|noescape},
-
-            custom_settings : {
-                    progressTarget : "{$swfuId|noescape}progress",
-                    cancelButtonId : "{$swfuId|noescape}btnCancel"
-            },
-            debug: false,
-
-            // Button settings
-            button_image_url: {=\Nette\Environment::expand("{$interface->baseUrl}/imgs/XPButtonUploadText_89x88.png")|escapeJS|noescape},
-            button_width: "89",
-            button_height: "22",
-            button_placeholder_id : "{$swfuId|noescape}placeHolder",
-    });
-
-    return true;
-
-})(jQuery);
+<script>
+(function($){
+
+    $("#{$swfuId|noescape}").swfupload({
+            flash_url : {$flash_url},
+            flash9_url : {$flash9_url},
+            upload_url: {$backLink|escapeJS|noescape},
+            post_params: {
+                token : {$token|escapeJS|noescape},
+                sender: "MFU-Swfupload"
+            },
+
+            file_size_limit : {$sizeLimit|escapeJS|noescape},
+            file_types : "*.*",
+            file_types_description : "All Files",
+            file_upload_limit : {$maxFiles|escapeJS|noescape},
+
+            custom_settings : {
+                    progressTarget : "{$swfuId|noescape}progress",
+                    cancelButtonId : "{$swfuId|noescape}btnCancel"
+            },
+            debug: false,
+
+            // Button settings
+            button_image_url: {$button_image_url},
+            button_width: "89",
+            button_height: "22",
+            button_placeholder_id : "{$swfuId|noescape}placeHolder",
+    });
+
+    return true;
+
+})(jQuery);
 </script>
\ No newline at end of file
diff --git a/MultipleFileUpload/UI/Uploadify/Controller.php b/MultipleFileUpload/UI/Uploadify/Controller.php
index 95ca628..2d50fdf 100644
--- a/MultipleFileUpload/UI/Uploadify/Controller.php
+++ b/MultipleFileUpload/UI/Uploadify/Controller.php
@@ -68,7 +68,8 @@ public function handleUploads()
 	 */
 	public function render(MultipleFileUpload $upload)
 	{
-		$template = $this->createTemplate(dirname(__FILE__) . "/html.latte");
+        $template = parent::createTemplate();
+        $template->setFile(__DIR__ . "/html.latte");
 		$template->uploadifyId = $upload->getHtmlId() . "-uploadifyBox";
 		return $template->__toString(TRUE);
 	}
@@ -79,14 +80,15 @@ public function render(MultipleFileUpload $upload)
 	 */
 	public function renderInitJavaScript(MultipleFileUpload $upload)
 	{
-		$tpl = $this->createTemplate(dirname(__FILE__) . "/initJS.latte");
-		$tpl->sizeLimit = $upload->maxFileSize;
-		$tpl->token = $upload->getToken();
-		$tpl->maxFiles = $upload->maxFiles;
-		$tpl->backLink = (string) $upload->form->action;
-		$tpl->uploadifyId = $upload->getHtmlId() . "-uploadifyBox";
-		$tpl->simUploadFiles = $upload->simUploadThreads;
-		return $tpl->__toString(TRUE);
+        $template = parent::createTemplate();
+        $template->setFile(__DIR__ . "/initJS.latte");
+        $template->sizeLimit = $upload->maxFileSize;
+        $template->token = $upload->getToken();
+        $template->maxFiles = $upload->maxFiles;
+        $template->backLink = (string) $upload->form->action;
+        $template->uploadifyId = $upload->getHtmlId() . "-uploadifyBox";
+        $template->simUploadFiles = $upload->simUploadThreads;
+        return $template->__toString(TRUE);
 	}
 
 
@@ -95,7 +97,8 @@ public function renderInitJavaScript(MultipleFileUpload $upload)
 	 */
 	public function renderDestructJavaScript(MultipleFileUpload $upload)
 	{
-		return $this->createTemplate(dirname(__FILE__) . "/destructJS.js")->__toString(TRUE);
+        $template = parent::createTemplate();
+        return $template->setFile(__DIR__ . "/destructJS.js")->__toString(TRUE);
 	}
 
 
@@ -104,7 +107,8 @@ public function renderDestructJavaScript(MultipleFileUpload $upload)
 	 */
 	public function renderHeadSection()
 	{
-		return $this->createTemplate(dirname(__FILE__) . "/head.latte")->__toString(TRUE);
+        $template = parent::createTemplate();
+        $template->setFile(__DIR__ . "/head.latte")->__toString(TRUE);
 	}
 
 
diff --git a/MultipleFileUpload/config.neon b/MultipleFileUpload/config.neon
new file mode 100644
index 0000000..6a71320
--- /dev/null
+++ b/MultipleFileUpload/config.neon
@@ -0,0 +1,4 @@
+services:
+	- MultipleFileUpload\UI\Registrator(%productionMode%,)
+	- MultipleFileUpload\UI\HTML4SingleUpload\Controller
+	- MultipleFileUpload\UI\Plupload\Controller
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 93cc56a..955e424 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
 		}
 	},
 	"require": {
-		"php": ">= 5.3.0",
-		"nette/nette": ">= 2.0"
+		"php": ">= 5.6.0",
+		"nette/nette": "~2.4"
 	}
 }