Refactored Dimension an Location.