Bug 861725 - Part 1: Add supplementary module into emulator