Added quoting functionality in match creation