Add dwarf and trees