FraudService - refactored