Removed Bridge and improved DI handling