Refactored the Processor.