Refactored PommAwareCommand.