Added SystemService.
Removed CredentialFilter.