Added --prefix and --suffix token match