Reflect current emuLib changes