diff --git a/gruntfile.js b/gruntfile.js
index 8d60a8dc..5d7f9f79 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -87,6 +87,10 @@ module.exports = function(grunt) {
 			upgrade: {
 				command: 'php scripts/upgrade.php',
 			},
+
+			optimizeComposer: {
+				command: 'composer dumpautoload -o'
+			},
 		},
 
 		copy: {
@@ -164,6 +168,6 @@ module.exports = function(grunt) {
 		fs.unlink('public_html/app.min.js.map');
 		fs.unlink('public_html/app.min.css');
 	});
-	grunt.registerTask('build', ['clean', 'copy:dist', 'uglify', 'cssmin', 'processhtml']);
+	grunt.registerTask('build', ['clean', 'shell:optimizeComposer', 'copy:dist', 'uglify', 'cssmin', 'processhtml']);
 
 };
diff --git a/src/Injector.php b/src/Injector.php
index d9abf978..8829a930 100644
--- a/src/Injector.php
+++ b/src/Injector.php
@@ -17,6 +17,8 @@ final class Injector
 		$builder = new ContainerBuilder();
 		$builder->setDefinitionCache(new ArrayCache());
 		$builder->addDefinitions($definitionsPath);
+		$builder->useAutowiring(true);
+		$builder->useAnnotations(false);
 		self::$container = $builder->build();
 	}