Updated to add emulator start support