Updated emulation layer