AutoFac Improvements