With the addition of the new ancillary services and merchant plant models, it may make sense to consider separating the revenue streams from the debt/ownership structures in SAM's financial models, so that improvements to one section can be applied to multiple debt models more easily. Future wishlist item.