Adding support for date-limited leasons