Lease management implemented.
Merging conflicts.