Added mode detection for all responses