Replaced dimension with field in a lot of places