US-VISIT to include visa waivers