Revert "Removed unused dimensions and measures"

This reverts commit 216ed30bb21163933a4628e37f088c1b57b449f7.