Improved edif backend