Add unfinished apic support