Adding elf and dwarf back