Added some globals and injection dependancies