Initial changes for loan tracking