Do you have plans to extend this to include Calculation Groups? Would love to see this feature.