Integrated UPF code into core assembly