elffile class changes (templates usage)