Processor refactor