We are facing the same issue. We have three sections: one-time cost, recurring cost and optional. Haven't found a satisfying solution yet.

...