Split dwarf into two versions