Added more flags to look for including leases