EST-266, EST-270: LeaseType and Charge updated, fixed field length to match real data