Removed dependency on service locator, and fixed bug with lifetime scope