(1) Sync few more functions
(2) File Conflict: leasing [Basic]