Make most injected services optional