Sub-meter and Mains

The FMs on all my sites are required to track the sub-meters (mostly for kitchens and high-use areas of the buildings). These are important because they locate particular uses and areas within the building which may be going awry. At the moment, if you include subs in the list of meters, the building analysis 'sums' the total of all those meters (ie- it'll double the electrical consumption, as it adds all the individual subs to the main reading). Will the capability of distinguishing subs and mains be added in?