More ELF support