Added missing attributes and dimensions.