Add new emulator and improve subscriptions