Replaced Dimension for SingleElement keywords with a TreeSet
Added a dimensionRepo
Added id for dimensions