Deal Tracking for MRR and NRC

I have been testing the Deal functions in HubSpot and just talked to support. I have noticed that I do not have the option (and can’t add a property) to indicate if the amount I am adding is Monthly Recuring Revenue (MRR) or Non-Recuring Revenue (NRC).
I also, cannot add directly to the Monthly Recurring Revenue property. It is calculated. I add Line Items to the Create Deal view. This allows me to select if the amount I am adding is Recurring revenue but it only allows adding by quantity. It does not allow me to add a monthly dollar amount.
I tried creating a new Monthly property but then it is not calculated in the totals at the top of the Deal page.
I created a Tag for MRR which will be added to the Deal Card if Monthly Recurring Revenue field is greater than 0. However, the only way to get anything in this field is to enter a Line Item that is Recurring and provide a count to calculate costs. Additionally, I don’t see anywhere to specify the contract length so the system can calculate total revenue of a contract.
It would be helpful to know how others are using the Deal board. Have others run into these same limitations and how do they mix MRR and NRC revenue. Without this ability, I don’t see much value in this feature.

Here is a great article from Stuart on how to manage RR (recurring revenue): https://www.connectedgtm.com/p/how-to-automate-your-renewal-pipeline-in-hubspot. Also, you may take a look at the CloneNer app itself; in some cases, it could help. Thanks!

That is a good article on how to streamline recurring agreements but it does not address the issue I posted which was related to MRR vs NRC Deals.