In process of modifying the way lease information is stored.