add more NAMES support