Added more edge-cases to Leases