[#47] Updated code according to changes in emuLib