create custom Dimension groups
Code cleaning