Add initial name-detect support