[#2] Updated sources to reflect current emuLib changes