Added EFX remapping code. The solution is not optimized but at the moment I haven't found anything better