diff --git a/dependencies.ts b/dependencies.ts
new file mode 100644
index 0000000..cded41b
--- /dev/null
+++ b/dependencies.ts
@@ -0,0 +1,4 @@
+import {Injectable}       from    './injectable';
+export interface Dependencies {
+    providers: Array<Injectable>;
+}
diff --git a/index.d.ts b/index.d.ts
index 117ced3..32db988 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1 +1,2 @@
-export function BootScript(): any;
\ No newline at end of file
+export function Inject(): any;
+export function fireLoopBootstrap(): any;
\ No newline at end of file
diff --git a/index.js b/index.js
index cb99cf5..3bc74ed 100644
--- a/index.js
+++ b/index.js
@@ -1,12 +1,25 @@
 "use strict";
-function BootScript() {
+/**
+ * @author Andres Jimenez Fork from @mean-expert/boot-script by Jonathan Casarrubias
+ * @module Inject Decorator
+ * @license MIT
+ * @description
+ * This decorator will return singleton instances
+ * This avoids the need of creating static Injects
+ **/
+function Inject(injectionKey) {
     function f(target) {
-        function BootScriptInstance(reference) {
+        var targetType = target.constructor;
+        if (!targetType.hasOwnProperty('__inject__')) {
+            targetType.__inject__ = {};
+        }
+        targetType.__inject__ = injectionKey;
+        function InjectInstance(reference) {
             return new target(reference);
         }
-        return BootScriptInstance;
+        return InjectInstance;
     }
     return f;
 }
-exports.BootScript = BootScript;
-//# sourceMappingURL=index.js.map
\ No newline at end of file
+exports.__esModule = true;
+exports["default"] = Inject;
diff --git a/index.ts b/index.ts
index b9235d8..3bb83e8 100644
--- a/index.ts
+++ b/index.ts
@@ -1,19 +1,119 @@
+import { Dependencies }     from    './dependencies';
+import { Injectable }       from    './injectable';
+
 /**
- * @author Jonathan Casarrubias
- * @module BootScript Decorator
+ * @author Andres Jimenez Fork from @mean-expert/boot-script by Jonathan Casarrubias
+ * @module Inject Decorator
  * @license MIT
  * @description
- * This decorator will return boot script instances
- * This avoids the need of creating static bootscripts
+ * This decorator will return singleton instances
+ * This avoids the need of creating static Injects
  **/
-export function BootScript() {
-    function f(target: any)
-    {
-        function BootScriptInstance(reference: any)
-        {
-            return new target(reference);
+let prepared: Array<any> = [];
+
+export function Inject(dependencies: Dependencies): Function {
+    'use strict';
+
+    let args: Array<Function> = [];
+
+    Array.prototype.push.apply(args, dependencies.providers);
+
+    // return the function specified by ts documentation
+    return (target: any) => {
+
+        // the new constructor behaviour
+        let f: any = function (): any {
+
+            // prepre holder for instances
+            let instances: Array<any> = [];
+
+            // retrive instance of the class
+            for (let entry of f._dependencies) {
+                instances.push(instanceiateDependency(f, entry));
+            }
+
+            // apply to original target constructor
+            target.apply(this, instances);
+            f._instance = this;
+        };
+
+
+        // loop all the providers and attach who is providing them
+        for (let provider of dependencies.providers) {
+
+            // check if any providing is there
+            if (provider._providing === undefined) {
+                provider._providing = [];
+            }
+
+            // save reference to this class
+            provider._providing.push(f);
+        }
+
+        // copy prototype
+        f.prototype = target.prototype;
+        f._dependencies = args;
+
+        prepared.push(f);
+
+        return f;
+    };
+}
+
+function instanceiateDependency(caller: Injectable, target: Injectable): any {
+
+    'use strict';
+
+    // temp reference to instances
+    let temp: any;
+
+    // check if an instances exists
+    if (target._instance === undefined) {
+
+        // create new instance
+        target._instance = new target();
+
+        // check if any classes should be enabled first
+        if (target._providing !== undefined) {
+
+            // if caller is not allowed basically
+            if (target._providing.indexOf(caller) === -1) {
+
+                // create new instances of them first
+                for (let provider of target._providing) {
+
+                    temp = new provider();
+                }
+
+                // delete all stuff about providing
+                delete target._providing;
+            }
         }
-        return <any>BootScriptInstance;
     }
-    return f
+
+    return target._instance;
 }
+
+export function fireLoopBootstrap(main: Injectable): void {
+
+    'use strict';
+
+    let tmp: any;
+
+    // start everything
+    for (let entry of prepared) {
+
+        // start only if not allready started
+        if (entry._instance === undefined) {
+
+            tmp = new entry();
+        }
+    }
+
+    // start instance
+    if (main._instance === undefined) {
+        this.main = new main();
+    } else {
+        this.main = main._instance;
+    }
+}
\ No newline at end of file
diff --git a/injectable.ts b/injectable.ts
new file mode 100644
index 0000000..3cbbbff
--- /dev/null
+++ b/injectable.ts
@@ -0,0 +1,6 @@
+export interface Injectable extends Function {
+    new(...args: Array<any>): any;
+    _instance?: any;
+    _dependencies?: Array<any>;
+    _providing?: Array<any>;
+}
diff --git a/package.json b/package.json
index 699939a..96d4f66 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@mean-expert/boot-script",
+  "name": "@mean-expert/inject",
   "version": "1.0.0",
-  "description": "FireLoop BootScript Decorator",
+  "description": "FireLoop Inject Decorator",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
@@ -22,6 +22,7 @@
   ],
   "author": "Jonathan Casarrubias",
   "license": "MIT",
+  
   "bugs": {
     "url": "https://github.com/mean-expert-official/boot-script/issues"
   },