Add wild card matching