Adding more opportunities to pass in data