Refactor APU processing