Improved emulation files