Complete the EM integration into router