Improved elf configuration