good point. For different things we kept it quite simple, but soon we are certainly going towards these refinements and your suggestion sounds pretty good imho