A More Comprehensive Habitable Zone for Finding Life on Other Planets