Support tuple and remove dupe check