Refactored SFCredentialsValidator