Add dimensionType (from petter) and change 2 -> SHORT_ for integers