Sneha/Shruthi | #986 | Added mappers for all dimensions