More restructuring
Use channel API for push request to emulator