Added tuple-bases mapping