improved custom dimensions management