Refactored discriminators.